[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: merge should copy-with-history

From: Branko ╚ibej <brane_at_xbc.nu>
Date: 2002-08-08 23:24:32 CEST

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.


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
Received on Thu Aug 8 23:25:08 2002

This is an archived mail posted to the Subversion Dev mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.