[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: Error during merge

From: Tyler
Subject: Re: Error during merge
Date: Mon, 24 May 2004 14:53:01 -0700
User-agent: Mutt/

On Mon, May 24, 2004 at 03:52:56PM -0400, address@hidden 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
> retrieving revision 1.2
> Merging differences between 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.


reply via email to

[Prev in Thread] Current Thread [Next in Thread]