[SVN-3747] 'svn diff' and 'svn patch' support of svn:mergeinfo

• Type: Improvement
• Status: Closed
• Priority: Major
• Resolution: Fixed
• Affects Version/s: trunk
• Fix Version/s: unscheduled
• Component/s: libsvn_diff
• Assignee: Unassigned
• Reporter: Daniel Shahaf
• Created: 10/Nov/10 19:15
• Updated: 22/Jun/18 12:51
• Resolved: 29/Jan/18 09:28

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/[e-mail]

Issue Links

• is duplicated by: SVN-4659 svn patch doesn't restore svn:mergeinfo property at the working path root