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

Merge errors out after resolving conflicts

    Details

    • Type: Bug
    • Status: Resolved
    • Priority: Major
    • Resolution: Fixed
    • Affects Version/s: trunk
    • Fix Version/s: 1.8.0
    • Component/s: libsvn_client
    • Labels:
      None

      Description

      After resolving conflicts interactively during one revision range of a
      multi-revision-range merge, the merge errors out even if we resolved all the
      conflicts.  It should instead proceed to the next revision range if we resolved
      all the conflicts.
      
      Reproduction recipe from Stefan K√ľng:
      > svn co -r23862 https://tortoisesvn.googlecode.com/svn/branches/1.7.x/src tsvnsrc
      > cd tsvnsrc
      > svn merge -c23846,23862 https://tortoisesvn.googlecode.com/svn/trunk/src
      > 
      > if you hit 'e' to edit the file, remove the conflict, save it, exit the
      > editor, then hit 'r' to mark the conflict as resolved: svn reports still
      > a conflict and aborts the merge. Even though I explicitly told it that I
      > resolved the conflict!
      
      See the dev@ email thread "problems with merging", started 2013-01-27.
      
      This issue applies to multiple explicit revision ranges as in this recipe, and
      also to multiple sub-ranges created by the merge internally skipping revision
      that are already recorded as merged, if it is a mergeinfo-aware merge.
      

        Attachments

          Activity

            People

            • Assignee:
              julianfoad Julian Foad
              Reporter:
              julianfoad Julian Foad
            • Votes:
              0 Vote for this issue
              Watchers:
              0 Start watching this issue

              Dates

              • Created:
                Updated:
                Resolved: