[jira] [Commented] (SVN-3747) 'svn patch' support of svn:mergeinfo

["Stefan Sperling (JIRA)" <ji...@apache.org>]

    [ https://issues.apache.org/jira/browse/SVN-3747?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=15625066#comment-15625066 ] 

Stefan Sperling commented on SVN-3747:
--------------------------------------

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.

> '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 (äñ§€¥£¢)
>             Fix For: unscheduled
>
>
> {noformat:nopanel=true}
> '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.
> {noformat}
> http://mid.gmane.org/20101110174839.GB25538@jack.stsp.name



--
This message was sent by Atlassian JIRA
(v6.3.4#6332)