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

Merge algorithm chokes on subtrees needing special attention that have been renamed

    XMLWordPrintableJSON

    Details

      Description

      As part of the investigation of issue #3067, code examination led me to wonder
      how the merge algorithm handles a particular scenario.  Namely, when a subtree
      that needs special attention (due to having different mergeinfo than its parent,
      typically) has a rename in its history in the middle of the requested merge
      range. I suspected the logic would suffer the same sorts of problems noticed in
      issue #3067, and I think I was right.  I'll attach a recipe to demonstrate.
      

        Attachments

        1. 1_issue-3174-recipe.sh
          1 kB
          C. Michael Pilato

          Activity

            People

            • Assignee:
              Unassigned
              Reporter:
              cmpilato C. Michael Pilato
            • Votes:
              0 Vote for this issue
              Watchers:
              1 Start watching this issue

              Dates

              • Created:
                Updated:
                Resolved: