Stefan Sperling wrote:
> On Thu, Jul 03, 2014 at 04:13:54PM +0100, Julian Foad wrote:
>> With Subversion 1.8.9:
>> [[[
>> Modified: svn:mergeinfo
>> Merged /trunk:r16-18
>> ]]]
>>
>> With Subversion trunk the last part of the output changes to:
>>
>> [[[
>> Modified: svn:mergeinfo
>> ## -0,0 +0,1 ##
>> Merged /trunk:r16-18
>> ]]]
>
> There is a rational outlined in the commit which introduced this change.
>
> ------------------------------------------------------------------------
> r1598092 | stsp | 2014-05-28 20:08:52 +0200 (Wed, 28 May 2014) | 14 lines
>
> For issue #3747, 'svn patch' support of svn:mergeinfo, make it
> possible to parse svn:mergeinfo diffs regardless of i18n.
>
> * subversion/libsvn_diff/util.c
> (display_mergeinfo_diff): Print a hunk header line for mergeinfo diffs.
> The header indicates the number of reverse-merges and forward-merges in
> the diff. Before this change, this information was only printed as part
> of output which is translated for i18n. This made it impossible to reliably
> parse svn:mergeinfo diffs from patch files.
> Futher changes to the diff parser and svn patch are coming soon.
> ------------------------------------------------------------------------
Thanks for explaining the rationale.
I like having parseable output.
How exactly does the '##' line indicate the number of merges?
- Julian
> The idea to make 'svn patch' support mergeinfo was later vetoed.
>
> I think the information is still valuable to diff parsers, and our diff
> parser was also changed to look for it (though svn patch doesn't use it).
> I don't see a problem with adding this feature but if someone can show
> that it arguably introduces a huge problem I would revert it.
Received on 2014-07-03 18:34:11 CEST