Re: Going further with GAR

On Sunday 16 March 2003 21:12, you wrote:
> On Sun, 16 Mar 2003, Charles Lacour wrote:
> > How do I go about updating the gar tree so that it reflects the latest
> > changes?
>
> The easiest way is to do a cvs checkout from directly above your local gar
> directory, as in:
>
> cvs -z3 -d:pserver:[email protected]:/usr/local/var/cvs login
> [ press return for the password ]
> cvs -z3 -d:pserver:[email protected]:/usr/local/var/cvs co gar
>
> That should fire off a round of updates/patches and get you up to the
> cutting-edge.


From what I understood of CVS, that's what I thought, too.  When I do it, 
though, I get a bunch of error messages like this:


cvs server: Updating gar/utils/which
cvs checkout: move away gar/utils/which/Makefile; it is in the way
C gar/utils/which/Makefile
cvs checkout: move away gar/utils/which/checksums; it is in the way
C gar/utils/which/checksums
cvs server: Updating gar/utils/wipe
cvs checkout: move away gar/utils/wipe/Makefile; it is in the way
C gar/utils/wipe/Makefile
cvs checkout: move away gar/utils/wipe/checksums; it is in the way
C gar/utils/wipe/checksums
cvs server: Updating gar/utils/wipe/files
cvs checkout: move away gar/utils/wipe/files/gar-base.diff; it is in the way
C gar/utils/wipe/files/gar-base.diff
cvs server: Updating gar/utils/x86info
cvs checkout: move away gar/utils/x86info/Makefile; it is in the way
C gar/utils/x86info/Makefile
cvs checkout: move away gar/utils/x86info/checksums; it is in the way
C gar/utils/x86info/checksums
cvs server: Updating gar/utils/x86info/files
cvs checkout: move away gar/utils/x86info/files/gar-base.diff; it is in the 
way
C gar/utils/x86info/files/gar-base.diff

I did get a few entries that looked like: 

cvs server: Updating gar/utils/id-utils
U gar/utils/id-utils/Makefile
U gar/utils/id-utils/checksums
cvs server: Updating gar/utils/id-utils/files
U gar/utils/id-utils/files/gar-base.diff

which is what I consider normal for CVS.

*******************************************************

Ok, update 10 minutes later, after digging through the "info cvs" stuff.

The "C" means a conflict. It's supposedly updates the file, and renames the 
old version. I didn't find the renamed version, but running "co gar" again 
got me a bunch more "U"s (somebody just committed a bunch stuff, maybe?) and 
no more errors. Running it a third time got me a clean run -- no changes.

I decided to post this even after I kind of figured out what was going on and 
got it working, in case anybody else has similar issues.

Thanks for the help,

Charles Lacour