subversion-users mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Daniel Becroft <djcbecr...@gmail.com>
Subject Merged revisions missing when using 'svn log -g'
Date Mon, 07 Jul 2014 06:55:09 GMT
Hi,

svn 1.8.8 (r1568071)

I've found an interesting scenario where merged revisions are not appearing
in the output of an 'svn log -g' command.

The revision is included in the svn:mergeinfo changes for the merged
revision, but does not appear in the log output. The file changes are in
that commit

The property change includes:
svn diff -c 25041 --depth empty
Index: .
===================================================================
--- .   (revision 25040)
+++ .   (revision 25041)

Property changes on: .
___________________________________________________________________
Modified: svn:mergeinfo
   Merged
/trunk:r24741-24742,24755,24764,24770-24771,24776,24790,24859,24873,24
885-24886,24889,24896,24898,24900-24902,24910-24911,24914,24918,24921,24925,2492
9,24936,24938,24940-24942,24944,24946-24947,24957,24961-24962,24965,24967,24969,
24971-24972,24974-24976,24979-24987,24990-24991,24995-24997,25002-25003,25011-25
012,25015-25017,25019-25020,25022-25023,25025,25027,25030-25031,25033-25035

But the 'svn log -g' output for that revision gives the follow revisions as
the 'latest' revisions merged. Notice that 25030-31 does not appear, nor
does 25025 (even though the changes for these revisions are in the commit,
and they were on /trunk).

r25041
r25027
r25023
r25017
r25016
r25003

Any ideas on what else I need to look at? Or any other information that I
need to provide.

Cheers,
Daniel B.

Mime
View raw message