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

[Tony Hoyle]

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.

Tony