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

each editor drive gets its own notification during 'svn merge'

    XMLWordPrintableJSON

    Details

      Description

      When mergeinfo on a merge target dictates that a merge be broken up into
      multiple editor drives, we expect that each editor drive gets its own notification.
      
      E.g.:
      
      1.8-dev@1441473>svn mergeinfo --show-revs merged ^^/A/C branch
      r5
      r7
      
      1.8-dev@1441473>svn mergeinfo --show-revs eligible ^^/A/C branch
      r4
      r6
      r8
      
      1.8-dev@1441473>svn merge ^^/A/C branch
      --- Merging r2 through r4 into 'branch': <-- 1st editor drive
       U   branch
      --- Merging r6 into 'branch':            <-- 2nd editor drive
       U   branch
      --- Merging r8 through r9 into 'branch': <-- 3rd editor drive
       U   branch
      --- Recording mergeinfo for merge of r2 through r9 into 'branch':
       U   branch
      
      ### But this doesn't work correctly for file merges.  Only the first
      ### editor drive gets a notification.  This leads to rather confusing
      ### output:
      
      1.8-dev@1441473>svn mergeinfo --show-revs eligible ^^/iota iota-copy
      r4
      r6
      r8
      
      1.8-dev@1441473>svn mergeinfo --show-revs merged ^^/iota iota-copy
      r5
      r7
      
      1.8-dev@1441473>svn merge ^/iota iota-copy
      --- Merging r2 through r4 into 'iota-copy':
       U   iota-copy
       U   iota-copy
       U   iota-copy
      --- Recording mergeinfo for merge of r2 through r9 into 'iota-copy':
       U   iota-copy
      
      This is a regression from 1.7.
      

        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: