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

Re: Problem with non-conflicting merges of moves

From: Johan Corveleyn <jcorvel_at_gmail.com>
Date: Thu, 31 Aug 2017 21:23:27 +0200

On Thu, Aug 31, 2017 at 7:47 PM, Stefan Sperling <stsp_at_elego.de> wrote:
> On Thu, Aug 24, 2017 at 01:44:48PM +0200, Stefan Sperling wrote:
>> I see the following options going forward:
>
>> 2) Try to make the resolver handle the case where copyfrom does not point
>> back into the same branch. (How?)
>
> I have implemented option 2) in r1806831.

Awesome! 

-- 
Johan
Received on 2017-08-31 21:23:56 CEST

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.