Community technical support mailing list was retired 2010 and replaced with a professional technical support team. For assistance please contact: Pre-sales Technical support via email to sales@march-hare.com.
Daniel Lapolla wrote: > Yes, it works fine for merging. But I do not want to merge the branche, > I want to retrieve the branch, and I'm unable to update a file that is > scheduled for adition (after the merge) back to its branch. The only > thing I got in that situation is: cvs server: warning: new-born > newfile.txt has disappeared! > Are you saying you're adding the file then attempting to merge a branch onto it? That's just completely backwards.. cvs is doing exactly what you're telling it to do, since the file doesn't exist on the branch (and no revision exists on the server to conflict with) it deletes it. Tony