Re: "Move file away, it is in the way" errors

[Paul Edwards]

"Derek Robert Price" <derek@ximbiot.com> wrote in message 
news:mailman.1674.1066149547.21628.bug-cvs@gnu.org...
> I meant the other move-file-away cases.  I believe you complained some

It didn't say "move file away", it said "already added".

> time back that during a merge from a branch to a branch where a file
> with the same name had been added to both branches, CVS reported a
> conflict to you that could be accidentally lost track of by touching the
> file in question because no merge markers were put in the file.
>
> Larry and I were discussing the possibility of using diff's if-then-else
> syntax to specifiy a two-way-merge with merge markers on info-cvs
> instead of just printing the conflict warning or warning the user to
> move the file away in the update merge case.  I don't have time to
> implement this just now but I thought you might have enough interest to
> generate the patch.

I did have enough interest to generate a patch that would at
least mark the file as a conflict, which in my opinion is a hell
of a lot better than the current behaviour.

I submitted it with Changelog entry and sanity.sh already,
months ago.

BFN.  Paul.