[
https://issues.apache.org/jira/browse/SVN-3747?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
]
Julian Foad closed SVN-3747.
----------------------------
Resolution: Fixed
Since r1822164 'svn shelve' uses the no-pretty-print format and so supports
mergeinfo changes. Closing this issue.
> 'svn diff' and 'svn patch' support of svn:mergeinfo
> ---------------------------------------------------
>
> Key: SVN-3747
> URL: https://issues.apache.org/jira/browse/SVN-3747
> Project: Subversion
> Issue Type: Improvement
> Components: libsvn_diff
> Affects Versions: trunk
> Reporter: Daniel Shahaf (äñ§€¥£¢)
> Priority: Major
> Fix For: unscheduled
>
>
> '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:
> {noformat}
> > Modified: svn:mergeinfo
> > Merged /subversion/trunk:r964349
> {noformat}
> 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/[email protected]
--
This message was sent by Atlassian JIRA
(v7.6.3#76005)
