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

reintegrate merges update subtree mergeinfo unconditionally

    XMLWordPrintableJSON

    Details

      Description

      While working on issue #3577 it occurred to me that --record-only merges, unlike
      "regular" merges, still blindly record mergeinfo describing the merge on every
      subtree in the merge target that has explicit mergeinfo prior to the merge.
      
      I'm not certain this is actually a problem for --record-mergeinfo merges, they
      have always blindly recorded what we asked on every subtree, but --reintegrate
      merges use the same code to set mergeinfo describing the merge.  This means
      --reintegrate merges don't act like regular merges, which only update the
      subtrees which were touched by the merge.  The current behavior needs to be
      adjusted, so --reintegrate merges behave the same way.  Only then will the
      subtree mergeinfo work (http://svn.haxx.se/dev/archive-2009-08/0045.shtml)
      really be complete.
      

        Attachments

          Activity

            People

            • Assignee:
              Unassigned
              Reporter:
              pburba Paul Burba
            • Votes:
              0 Vote for this issue
              Watchers:
              0 Start watching this issue

              Dates

              • Created:
                Updated:
                Resolved: