Re: merge should copy-with-history

William Uther wrote:

>
> On Thursday, August 8, 2002, at 04:06 PM, Branko Èibej wrote:
>
>> Exactly! We've essentially broken the fix for issue 838 into two
>> parts. Now that Philip's patch is in, and the semantics of merging
>> added files is correct, we can move issue 838 to a branch and do the
>> more complex stuff there.
>
>
> Are you sure these semantics are correct? I don't think so! I think
> they are close - and it may not be worth getting them entirely correct
> before 1.0. But I do not think they are entirely correct yet. I'm
> not -1 on the change, just do it with your eyes open.

Yes, I am sure they're exactly correct.

> I just appended an example of my issue with the semantics to Issue #838.

Good.

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