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

Re: Remote move vs local edit conflict resolution options

From: Evgeny Kotkov <evgeny.kotkov_at_visualsvn.com>
Date: Thu, 6 Oct 2016 23:15:00 +0300

Stefan Sperling <stsp_at_elego.de> writes:

> I'd say yes, let's try that.
> The delete options are there now because I added them before adding
> a move+merge option became possible.
> One concern is that perhaps the move heuristic gets it wrong,
> and there was in fact a deletion. But if that happens we should
> fix the problem where it really is: in the move detection algorithm.
> Thanks!

Just for the record, I implemented this behavior in r1762939 [1].

[1] https://svn.apache.org/r1762939

Evgeny Kotkov
Received on 2016-10-06 22:15:30 CEST

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