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

Prevent mergeinfo with paths mapped to empty ranges

    XMLWordPrintableJSON

    Details

    • Type: Improvement
    • Status: Closed
    • Priority: Minor
    • Resolution: Fixed
    • Affects Version/s: trunk
    • Fix Version/s: 1.5.0
    • Component/s: libsvn_client
    • Labels:

      Description

      Currently we create/permit svn:mergeinfo where some or all of the paths map to
      empty revision ranges, e.g.:
      
      "/A:"
      
      "/trunk:\n/branch2:"
      
      "/A:3-4\nB:\n/C:5"
      
      But since explicit mergeinfo for a path is always complete, removing the paths
      mapped to empty ranges results in mergeinfo which is semantically equivalent and
      more concise:
      
      "/A:" --> ""
      
      "/trunk:\n/branch2:" --> ""
      
      "/A:3-4\nB:\n/C:5" --> "/A:3-4\n/C:5"
      
      Anywhere we parse, create, calculate, or otherwise change svn:mergeinfo the
      following rules should be applied:
      
        1) If mergeinfo consists exclusively of paths mapped to
           empty ranges change the mergeinfo to ""
      
        2) If mergeinfo consists of some paths mapped to actual
           ranges and some mapped to empty ranges, remove the
           latter.
      

        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: