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

Merge order affects final result for repeated added & deleted changes

    Details

    • Type: Bug
    • Status: Open
    • Priority: Major
    • Resolution: Unresolved
    • Affects Version/s: 1.8.x
    • Fix Version/s: ---
    • Component/s: libsvn_client
    • Labels:
      None
    • Environment:

      Windows 7

      Description

      There seems to be a problem with the merge logic in SVN when merging
      repeated added & deleted changes out-of-order.
      
      Example activity on branch A:
      r1: A new file is added.
      r2: A line is added
      r3: The line is removed
      r4: The line is re-added
      Later activity on branch B (created from A_at_r1):
      r5: r2 and r4 are merged in.
      r6: r3 is merged in.
      
      What happens in r5 is that repeated merging of the same change does _not_
      cause duplication or merge conflict. Instead, r4 seems to be ignored. The
      end result after r6 (a complete merge) is that r4 is missing from branch B.
      This is inconsistent with svn:mergeinfo which claims that it has been
      merged. Patches to reproduce are attached to the mail-list URLs.
      
      Could it be possible to make svn merges fail on repeated merges of the same
      change, instead of just ignoring them?
      
      The problem was reproduced using svn 1.8.1 (command-line) client on Win7
      64bit SP1, and svn server 1.7.6 (VisualSVN 2.5.6, Apache 2.2.22) on Win
      server 2008 R2.
      
      Related discussions on dev@svn:
      http://svn.haxx.se/dev/archive-2013-04/0205.shtml
      

      http://svn.haxx.se/users/archive-2013-08/0049.shtml

      Original issue reported by forderud

        Attachments

        1. 2_merge_tests.py2.patch
          2 kB
          Subversion Importer
        2. 1_test_patches.txt
          0.7 kB
          Subversion Importer

          Activity

            People

            • Assignee:
              Unassigned
              Reporter:
              subversion-importer Subversion Importer
            • Votes:
              1 Vote for this issue
              Watchers:
              2 Start watching this issue

              Dates

              • Created:
                Updated: