[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Mergeinfo property diff regression

From: Julian Foad <julianfoad_at_btopenworld.com>
Date: Thu, 3 Jul 2014 16:13:54 +0100

'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

$ 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

This is an archived mail posted to the Subversion Dev mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.