subversion-issues mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From "Stefan Sperling (JIRA)" <j...@apache.org>
Subject [jira] [Assigned] (SVN-4740) conflict resolver searches too far back with file edit vs move
Date Tue, 19 Jun 2018 13:07:00 GMT

     [ https://issues.apache.org/jira/browse/SVN-4740?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
]

Stefan Sperling reassigned SVN-4740:
------------------------------------

    Assignee: Stefan Sperling

> 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)

Mime
View raw message