subversion-users mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Andrew Reedick <Andrew.Reed...@cbeyond.net>
Subject RE: log reporting some strange (for me) merged paths
Date Fri, 20 Dec 2013 14:25:03 GMT
> From: Pablo Beltran [mailto:pbeltranl@gmail.com] 
> Sent: Friday, December 20, 2013 3:29 AM
> To: users@subversion.apache.org
> Subject: log reporting some strange (for me) merged paths

> (Q.1)Why is the 
>
> M /sis/branches/JDK7/ide-project/NetBeans/nbproject/genfiles.properties
>
> present in the merge log (r1400370)whether it is not in the (r1400377) 
> log. Does it mean that the genfiles.properties@1400370 was merged into 
> the /sis/branches/JDK6@1400377 but it was just the same file and 
> therefore it was not modified in the r1400377?

The file wasn't changed during the merge so it doesn't get committed, so it doesn't show up
in r1400377.  

The file is listed the 'merged via' because 'svn log' includes all files/changes for a revision.
 'svn log -g' doesn't automagically trim any "unmerged" changes from the "merged via" revision.

>
> (Q.2) What does it mean? It looks like the /sis/branches/JDK6 
> directory was merged against itself...

Merges tend to change the svn:mergeinfo property on directories.   Try doing a 'svn diff -r
1400377 /sis/branches/JDK6'.  Use the '--properties-only' switch to make it clearer.


Mime
View raw message