Re: [PATCH] Issue 838 merge should copy-with-history

Karl Fogel wrote:

>Branko Čibej <brane@xbc.nu> writes:
>
>
>>No, not controversial. It's just that I feel very strongly that the
>>merge semantics should be fixed ASAP, and that the incidental --
>>temporary and "issueized" -- weirdness in the feedback is a low enough
>>price to pay for that.
>>
>>In the end, it boils down to this: do you think I should revert
>>revisions 2910 and 2911? They don't break the tests, and the feedback
>>problem shows up _only_ during merge, nowhere else.
>>
>>
>
>Well, the do break the tests *now*, as soon as I commit up my fix to
>the test suite, heh. But they only break one or two tests, which I've
>simply commented out for now.
>

That's strange. I ran the tests before committing the patch, and there
were no differences (i.e., the same tests failed on Windows as before).

-- 
Brane Čibej   <brane_at_xbc.nu>   http://www.xbc.nu/brane/
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org