[Top][All Lists]

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

Error during merge

From: Christopher.Fouts
Subject: Error during merge
Date: Mon, 24 May 2004 15:52:56 -0400

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

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

reply via email to

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