I'm merging branchY into branchX via
> cvs -nq update -j b_branchX -j b_branchY proj
(I use the -nq so it does do the update yet ) and I get
retrieving revision 1.2.4.2
retrieving revision 1.2
Merging differences between 1.2.4.2 and 1.2 into file1.cpp
cvs update: file1.cpp: No such file or directory
I know that both revisions of the file exist since I can do
the following
> cvs co -r b_branchX proj
> cvs co -r b_branchY proj
and get the files, including file1.cpp...
--------------------------------------
Chris T Fouts
_______________________________________________
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs
