[cvsnt] Re: BUG when merging and removing files on branches

Tony Hoyle tmh at nodomain.org
Thu May 6 14:46:28 BST 2004

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.

On Thu, 6 May 2004 09:17:25 +0200, "Kevin" <zzz at zzz.zzz.org> wrote:

>The last step generates a message like:
>U file.txt
>cvs server: file file.txt has been modified, but has been removed in
>revision HEAD
>The command for the last step was (checkout and merge at one go):
>cvs -q checkout -P -r branch -jHEAD module (in directory U:\)
>BUG: The file was _not_ scheduled for removal.

This isn't a bug, it's a conflict.

You have edited a file, and another branch has deleted it.  There is
no safe resolution other than report this and expect the user to
handle it.

If it deleted it, then that would be a bug.


More information about the cvsnt mailing list
Download the latest CVSNT, TortosieCVS, WinCVS etc. for Windows 8 etc.
@CVSNT on Twitter   CVSNT on Facebook