Uploaded image for project: 'Subversion'
  1. Subversion
  2. SVN-4740

conflict resolver searches too far back with file edit vs move

    XMLWordPrintableJSON

Details

    • Bug
    • Status: Resolved
    • Major
    • Resolution: Fixed
    • 1.10.0
    • 1.10.1
    • libsvn_client
    • None

    Description

      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.

      Attachments

        1. repro-merge-too-far.sh
          4 kB
          Stefan Sperling

        Activity

          People

            stsp Stefan Sperling
            stsp Stefan Sperling
            Votes:
            1 Vote for this issue
            Watchers:
            3 Start watching this issue

            Dates

              Created:
              Updated:
              Resolved: