[Top][All Lists]

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

Merge (-j) is removing new files

From: Wayne Johnson
Subject: Merge (-j) is removing new files
Date: Fri, 20 Dec 2002 07:21:48 -0800 (PST)

We have a maintanance branch as well as new development on our trunk.

I recently attempted to merge changes from this branch onto the trunk and
found that the cvs up -j from_here -j to_here command was attempting to
remove several files from the trunk.  

The problem is that the files had been newly added to the trunk and had
never been on the maintanance branch.

Anyone have a clue as to why this happened.  

We're using:
Client: Concurrent Versions System (CVS) 1.11 (client/server)
Server: Concurrent Versions System (CVS) 1.11.1p1 (client/server)

Wayne Johnson,             | There are two kinds of people: Those 
3943 Penn Ave. N.          | who say to God, "Thy will be done," 
Minneapolis, MN 55412-1908 | and those to whom God says, "All right, 
(612) 522-7003             | then,  have it your way." --C.S. Lewis

Do you Yahoo!?
Yahoo! Mail Plus - Powerful. Affordable. Sign up now.

reply via email to

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