Re: Problem with cvs 1.11.2 and tracking third-party sources

[Larry Jones]

Stefan Scherer writes:
> 
> prompt> cvs checkout -jGS_7_03 -jGS_7_31 test
> cvs checkout: Updating test
> U test/gs_setpd.ps
> cvs checkout: nonmergeable file needs merge
> cvs checkout: revision 1.1.1.8 from repository is now in test/gs_setpd.ps
> cvs checkout: file from working directory is now in .#gs_setpd.ps.1.4
> C test/gs_setpd.ps

CVS is telling you that it was unable to merge the file automatically,  
so you're going to have to do it by hand.  (Why do you have PostScript
files marked as unmergable in your wrappers file?  PostScript is
generally text that merges quite well.)

> The strange thing is, cvs showed me a "C" state, but looking with
> cvs -n -q update to the source tree, the file has only "M" state
> and can be commited.

That may be regarded as unfortunate.

> That's what I always do. This examples shows only one file,
> the normal source tree has some hundred files and you can't have
> a look to all lines in the stdout. I always check only afterwards
> with cvs -n -q update and work through all files with a "C" state.

Bad idea -- you really do need to look at all the output.  You can
always save it in a log file.

> Ok, I've commited the merge results and now our changes have
> gone in the main branch. The following diff shows no differences
> between main branch and vendor branch.

Of course -- CVS *told* you it couldn't do the merge and was replacing
your working copy with the repository copy and you went and committed it
without doing a manual merge.  You got exactly what you asked for.

-Larry Jones

Why can't I ever build character in a Miami condo or a casino somewhere?
-- Calvin