[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: C. Michael Pilato <cmpilato_at_collab.net>
Date: Thu, 13 Aug 2009 10:46:29 -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.

That's correct.

(And by golly I *love* the foreign repository merge feature!! I've
completely reworked my approach to vendor branch management around that stuff.)

-- 
C. Michael Pilato <cmpilato_at_collab.net>
CollabNet   <>   www.collab.net   <>   Distributed Development On Demand
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=2383312

Received on 2009-08-13 16:47:18 CEST

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