: Error during merge
On Mon, May 24, 2004 at 03:52:56PM -0400, [EMAIL PROTECTED]
wrote:
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
[EMAIL PROTECTED] writes:
This sounds like a bug to me since cvs -nq update is
a valid command.
It is, and it's a long-standing one (because it's not easy to fix).
Checkout has a similar problem.
-Larry Jones
I hate it when they look at me that way. -- Calvin
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
On Mon, May 24, 2004 at 03:52:56PM -0400, [EMAIL PROTECTED] wrote:
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
