Re: [Issue 838] Changed - merge should copy-with-history not add

Philip Martin wrote:

>Karl Fogel <kfogel@newton.ch.collab.net> writes:
>
>
>
>>Branko ÄŒibej <brane@xbc.nu> writes:
>>
>>
>>>I'd like to see this in 0.14.1, because it fixes a real bug in merge
>>>semantics. Objections, anyone?
>>>
>>>
>>No objections -- agree with the reasoning in the issue.
>>
>>
>
>Since it was my patch originally I'll just say that if someone else
>wants to apply it then go ahead. My tree has some #749 access baton
>changes at the moment, which makes testing other things tricky, so
>until I've resolved those I won't apply the #838 patch.
>

O.K., I've assigned this issure to myself and set the 0.14.1 milestone.
I'll get to it ASAP.

(And sorry about misspelling your name in the issue comment, Philip...)

-- 
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