Re: Import with removed files
On Fri, Jun 30, 2000 at 10:45:13AM -0400, Larry Jones wrote: > W. Reilly Cooley Esq. writes: > > > > I'm trying to import GNU binutils 2.10 in place of 2.9.1, and a number > > of files have either been removed or moved, and so there are a lot of > > files which are not in the current import which still get checked out. > > Of course I can checkout with -j BINUTILS-2_10, but I'd prefer to only > > have to be able to do a checkout. > > If you do the traditional merge checkout that CVS suggests when there > are conflicts (e.g., ``cvs co -j BINUTILS-2_9_1 -j BINUTILS-2_10 > binutils'') and then commit the results, that will take care of removing > the obsolete files. Ah thanks--I figured there was probably a correct way to do it. Wil -- W. Reilly Cooley [EMAIL PROTECTED] Naked Ape Consulting http://nakedape.cc LNXS: Linux/GNU servers, networks, and http://lnxs.org people who take care of them. *Now with integrated crypto!* irc.openprojects.net #lnxs It is now quite lawful for a Catholic woman to avoid pregnancy by a resort to mathematics, though she is still forbidden to resort to physics and chemistry. -- H.L. Mencken
Re: Import with removed files
W. Reilly Cooley Esq. writes: > > I'm trying to import GNU binutils 2.10 in place of 2.9.1, and a number > of files have either been removed or moved, and so there are a lot of > files which are not in the current import which still get checked out. > Of course I can checkout with -j BINUTILS-2_10, but I'd prefer to only > have to be able to do a checkout. If you do the traditional merge checkout that CVS suggests when there are conflicts (e.g., ``cvs co -j BINUTILS-2_9_1 -j BINUTILS-2_10 binutils'') and then commit the results, that will take care of removing the obsolete files. -Larry Jones Monopoly is more fun when you make your own Chance cards. -- Calvin
Import with removed files
I'm trying to import GNU binutils 2.10 in place of 2.9.1, and a number of files have either been removed or moved, and so there are a lot of files which are not in the current import which still get checked out. Of course I can checkout with -j BINUTILS-2_10, but I'd prefer to only have to be able to do a checkout. Is there a relatively easy way to find these files and remove them? I figure at least I could run something like: cvs log -h -rBINUTILS-2_10 |grep 'Working file:'|awk '{print $3}' To get a list of current files, sort this, diff it with the output of 'find', and use that list of files as args to 'cvs remove'. But before I do this, I want to know if there is a better way? I notice that the 'cvs log' command above spits out a list of files on stderr *without* the requested tag/revision: cvs server: warning: no revision `BINUTILS-2_10' in `/cvsroot/lnxs/lnxs/usr.bin/ binutils/.cvsignore,v' cvs server: warning: no revision `BINUTILS-2_10' in `/cvsroot/lnxs/lnxs/usr.bin/ binutils/ChangeLog,v' I suppose I could use this to get the list of files to remove... Well, is going through and removing them even the right thing to do? Wil -- W. Reilly Cooley [EMAIL PROTECTED] Naked Ape Consulting http://nakedape.cc LNXS: Linux/GNU servers, networks, and http://lnxs.org people who take care of them. *Now with integrated crypto!* irc.openprojects.net #lnxs The first Rotarian was the first man to call John the Baptist "Jack." -- H.L. Mencken