[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: Stefan Sperling <stsp_at_elego.de>
Date: Thu, 31 Aug 2017 19:47:39 +0200

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.

It seems to work, but additional testing would be appreciated.

While doing random manual tests I saw some cases where the resolver
correctly identifies the move but then offered no useful resolution option.
I have not yet investigated why this is happening. I suspect we are
simply lacking conflict option implementations for these cases.
Received on 2017-08-31 19:47:51 CEST

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