You are CORRECT! I tried without the -n and it worked. This sounds like a bug to me since cvs -nq update is a valid command.
-chris -----Original Message----- From: Tyler [mailto:[EMAIL PROTECTED] Sent: Monday, May 24, 2004 5:53 PM To: Fouts Christopher () Cc: [EMAIL PROTECTED] Subject: Re: 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 > Merging differences between 1.2.4.2 and 1.2 into file1.cpp cvs update: > file1.cpp: No such file or directory cvs -n does not play nice with merges. I think this is because -n prevents cvs from doing anything, including creating the temp files it needs to do its merges. Instead of the -n, do the merge in a nice, safe sandbox. tyler _______________________________________________ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
