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

Re: tree conflict info

From: Neels Janosch Hofmeyr <neels_at_elego.de>
Date: Fri, 14 Aug 2009 21:58:04 +0200

Stefan Sperling wrote:
> On Thu, Aug 13, 2009 at 10:21:31AM -0400, Mark Phippard wrote:
>> On Thu, Aug 13, 2009 at 10:18 AM, Stefan Sperling<stsp_at_elego.de> wrote:
>>> On Thu, Aug 13, 2009 at 01:49:09PM +0100, Julian Foad wrote:
>>>> Neels Janosch Hofmeyr wrote:
>>>>> There won't ever be a different repository's URL in there, will there.
>>>> In a cross-repository merge? But I don't think we need to handle that at
>>>> the moment, do we?
>>> Didn't CMike do extra work to make merges from arbitrary URLs work?
>> Yes, but I do not think these can produce tree conflicts. They are
>> equivalent to --ignore-ancestry merges.
>
> A merge can cause tree conflicts no matter whether ancestry is ignored
> or not. Mikes log message talks about adding files. So just having a
> file added at the same place or a missing parent directory should
> be enough to trigger a tree conflict.

So true.
Implemented more intelligent caret notation URLling in r38758.
That made it become quite a complex tweak...

~Neels

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=2383739

Received on 2009-08-14 22:01:05 CEST

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