Re: New conflict resolver bug in tracing history

2017-07-18 Thread Julian Foad
Stefan Sperling wrote: > Thanks for finding this, Julian! Could you please file an issue for this? https://issues.apache.org/jira/browse/SVN-4688 - Julian > I expect that we'll find several such bugs. The related path hunting code > needs thorough review and testing. It passes the tests we have

Re: New conflict resolver bug in tracing history

2017-07-18 Thread Stefan Sperling
On Tue, Jul 18, 2017 at 12:27:42PM +0100, Julian Foad wrote: > I just ran into the following bug. It appears that the conflict resolver > doesn't properly follow branch (copy) history when searching for details. > > [[[ > $ svn sw ^/subversion/branches/shelve-checkpoint3 > [...] > > $ svn merge ^