Details

    • Type: Improvement
    • Status: Open
    • Priority: Major
    • Resolution: Unresolved
    • Affects Version/s: trunk
    • Fix Version/s: unscheduled
    • Component/s: libsvn_diff
    • Labels:
      None

      Description

      'svn diff --git | svn patch' should preserve svn:mergeinfo changes.
      
      
      Currently, 'svn diff --git' uses the "pretty-printing" logic when an
      svn:mergeinfo property is changed:
      
      > Modified: svn:mergeinfo
      >    Merged /subversion/trunk:r964349
      
      and 'svn patch' doesn't recognize this syntax.  (It does apply other
      properties, which are printed using the /^##/-hunks unidiff syntax.)
      
      
      This could be done by teaching 'svn patch' to parse the mergeinfo
      pretty-printing, or by having 'svn diff --git' print both a unidiff
      and a pretty-print for svn:mergeinfo.
      

      http://mid.gmane.org/20101110174839.GB25538@jack.stsp.name

        Issue Links

          Activity

          Hide
          stsp Stefan Sperling added a comment -

          The diff parser has now been parsing mergeinfo for some time (http://svn.apache.org/r1600096).

          However, 'svn patch' does not yet use this information.

          Show
          stsp Stefan Sperling added a comment - The diff parser has now been parsing mergeinfo for some time ( http://svn.apache.org/r1600096 ). However, 'svn patch' does not yet use this information.
          Hide
          pburba Paul Burba added a comment -

          Bulk update: For all issues filed before 1.7.0 was tagged and which still have
          the '---' milestone, bump to the 'unscheduled' milestone, as it is exceedingly
          unlikely that any of these are considered release blockers.  See
          http://svn.haxx.se/dev/archive-2013-03/0243.shtml
          

          Show
          pburba Paul Burba added a comment - Bulk update: For all issues filed before 1.7.0 was tagged and which still have the '---' milestone, bump to the 'unscheduled' milestone, as it is exceedingly unlikely that any of these are considered release blockers. See http://svn.haxx.se/dev/archive-2013-03/0243.shtml
          Hide
          danielsh Daniel Shahaf (äñ§€¥£¢) added a comment -

          Letting 'svn patch' parse the pretty-print would make for easier patch applications (and less 1000-
          character-lines property conflicts) in case the mergeinfo has fuzzed between generating and applying 
          the patch.
          
          It does imply that the unidiff strings 'Merged r%ld' mustn't be localized (at least when 'diff --git' is in 
          effect).
          

          Show
          danielsh Daniel Shahaf (äñ§€¥£¢) added a comment - Letting 'svn patch' parse the pretty-print would make for easier patch applications (and less 1000- character-lines property conflicts) in case the mergeinfo has fuzzed between generating and applying the patch. It does imply that the unidiff strings 'Merged r%ld' mustn't be localized (at least when 'diff --git' is in effect).
          Hide
          cmpilato C. Michael Pilato added a comment -

          Seems fine to me for 'diff' to display both the raw svn:mergeinfo delta and the
          pretty-printed form.
          

          Show
          cmpilato C. Michael Pilato added a comment - Seems fine to me for 'diff' to display both the raw svn:mergeinfo delta and the pretty-printed form.
          Hide
          stsp Stefan Sperling added a comment -

          I don't think this has anything to do with the --git option of svn diff.
          svn diff prints property changes as unidiff regardless of that option.
          
          

          Show
          stsp Stefan Sperling added a comment - I don't think this has anything to do with the --git option of svn diff. svn diff prints property changes as unidiff regardless of that option.

            People

            • Assignee:
              Unassigned
              Reporter:
              danielsh Daniel Shahaf (äñ§€¥£¢)
            • Votes:
              0 Vote for this issue
              Watchers:
              2 Start watching this issue

              Dates

              • Created:
                Updated:

                Development