Re: import inconsistency

[Paul Edwards]

"Derek Robert Price" <derek@ximbiot.com> wrote in message 
news:mailman.7884.1055537554.21513.bug-cvs@gnu.org...
> You are right that a 3-way diff against /dev/null is probably the full
> solution for the merge of two added files (on update w/o -j as well).
>  Your solution allows something which simply touches the file to cause
> CVS to lose track of the conflict.

Correct.  This solution is not perfect, but so long as you operate
in such a manner that you don't touch files, which I expect most
people do, then it is a hell of a lot better than it was before.

> A three-way diff would leave merge
> markers for CVS to check for as well.

That would be ideal, but I don't know how to do that.

> The test case you submitted leaves a little to be desired since if the
> three-way diff is every implemented, CVS will hopefully not flag a
> conflict since the content of both files was the same.

And they will need a testcase that shows that.  I've already
written the test case, all they need to do is change the last
statement.  They don't even need to change the second-last
one, because that is going to /dev/null.  I would assume that
in a proper fix they don't want to see that stuff about "has
been added" any more than anyone is interested in "has been
changed".

BFN.  Paul.