Mergeinfo property diff regression

'svn diff' describes svn:mergeinfo property diffs as "Merged ..." or "Reverse merged..." rather than using the unified diff output style that it uses for other property values.

With Subversion 1.8.9:

[[[
$ svn propget -rBASE svn:mergeinfo A; svn propget svn:mergeinfo A
/trunk:10-15,20-25
/trunk:10-18,20-25

$ svn diff
Index: A
===================================================================
--- A    (revision 1)
+++ A    (working copy)

Property changes on: A
___________________________________________________________________
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
]]]

The line beginning with "##" has crept in, where it was previously omitted.

I assume this is unintentional, as the information in it is not useful.

- Julian
Received on 2014-07-03 17:41:08 CEST