[
https://issues.apache.org/jira/browse/SVN-4740?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16517082#comment-16517082
]
Stefan Sperling commented on SVN-4740:
--------------------------------------
My patch had a small bug, fixed in [https://svn.apache.org/r1833842]
and nominated in https://svn.apache.org/r1833843
> conflict resolver searches too far back with file edit vs move
> --------------------------------------------------------------
>
> Key: SVN-4740
> URL: https://issues.apache.org/jira/browse/SVN-4740
> Project: Subversion
> Issue Type: Bug
> Components: libsvn_client
> Affects Versions: 1.10.x
> Reporter: Stefan Sperling
> Assignee: Stefan Sperling
> Priority: Major
> Attachments: repro-merge-too-far.sh
>
>
> When resolving a file edit vs move conflict, the conflict resolver will
> sometimes search through history back all the way to r0. This takes an
> unreasonable amount of time and should be avoided if possible.
--
This message was sent by Atlassian JIRA
(v7.6.3#76005)
