Re: Problem with non-conflicting merges of moves

2017-08-31 Thread Johan Corveleyn
On Thu, Aug 31, 2017 at 7:47 PM, Stefan Sperling 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 ha

Re: Problem with non-conflicting merges of moves

2017-08-31 Thread Stefan Sperling
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 addit

Re: Problem with non-conflicting merges of moves

2017-08-25 Thread Daniel Shahaf
Stefan Sperling wrote on Thu, 24 Aug 2017 13:44 +0200: > 5) Make the server send copyfrom args again (as it did in 1.5 times for > files during 'svn update'), but only during merges/(diffs?) and for > files and directories, with a heuristic that sends the correct copyfrom > source to t

Problem with non-conflicting merges of moves

2017-08-24 Thread Stefan Sperling
During a recent discussion in #svn-dev IRC, Johan and I identified a problem connected to merges of non-conflicting moves. (http://colabti.org/irclogger/irclogger_log/svn-dev?date=2017-08-22#l81) The new resolver in 1.10 makes sure that copyfrom info of a moved file or directory points back into t