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

'svn diff' and 'svn patch' support of svn:mergeinfo

    Details

    • Type: Improvement
    • Status: Closed
    • Priority: Major
    • Resolution: Fixed
    • 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

        Attachments

          Issue Links

            Activity

              People

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

                Dates

                • Created:
                  Updated:
                  Resolved: