John Hughes wrote:
As for the import, I see that I should be doing an "import -X" to avoid
getting my stuff bunged into the trunk.  Unfortunately Debian Sarge cvs
doesn't have the "X" option so I'll try backporting the Etch version.
So I backport Etch's cvs to Sarge, no problem, try again:
CVS_RSH=ssh cvs -d -z3  import -dX -ko -I! -b 1.1.5 -m "Import of e2fsprogs 1.37-2sarge1 for Debian" openssi/e2fsprogs DEBIAN E2FSPROGS-DB-1-37-2SARGE1's password:
cvs server: invalid option -- X
Usage: cvs import [-d] [-k subst] [-I ign] [-m msg] [-b branch]
    [-W spec] repository vendor-tag release-tags...
        -d      Use the file's modification time as the time of import.
        -k sub  Set default RCS keyword substitution mode.
        -I ign  More files to ignore (! to reset).
        -b bra  Vendor branch id.
        -m msg  Log message.
        -W spec Wrappers specification line.
(Specify the --help global option for a list of other help options)
Looks like sourceforge's cvs doesn't have the "-X" option.
CVS_RSH=ssh cvs -d -z3 version
Client: Concurrent Versions System (CVS) 1.12.13 (client/server)'s password:
Server: Concurrent Versions System (CVS) 1.11.20 (client/server)
Yow, Sourceforge has 1.11.20.  Older that the Debian Sarge version.

Should I import without -X and do a manual remove of e2fsprogs from the trunk?