mergeinfo reports revisions followed by a star

417 views
Skip to first unread message

Yves Martin

unread,
Dec 2, 2011, 8:57:27 AM12/2/11
to Subversion SVN
With Subversion 1.7.1 client side (1.6.x on server), the mergeinfo
command reports some revisions followed by a star.

Example:
$ svn mergeinfo --show-revs eligible ^/branches/1.0.x ^/trunk
r49798
r49815*
r49834
r49890
r49908*
r49925

What does that trailing star mean ?

I have looked at "svn mergeinfo --help" and SvnBook
http://svnbook.red-bean.com/en/1.7/svn.ref.svn.c.mergeinfo.html
but there is no example like my output nor explanation.

Larry Martell

unread,
Dec 2, 2011, 9:49:50 AM12/2/11
to subvers...@googlegroups.com

From http://www.collab.net/community/subversion/articles/merge-info.html:

This '*' is the marker for a non-inheritable mergeinfo range. The '*'
means that only the path on which the mergeinfo is explicitly set has
had this range merged into it.

What that means, I don't really know, but you can read more about this
at the above link.

HTH,
-larry

Yves Martin

unread,
Dec 5, 2011, 2:49:19 AM12/5/11
to Subversion SVN
Thank you.
In fact, these revisions have been "improperly" merged (for instance,
exclude /trunk from its after-merge commit) and the author has later
used "--record-only" option but surely with a wrong depth or on a
partial checkout.
As a result these marks appear and there is also an additional strange
behavior when applying new merges to the /trunk - each files and
directories are temporary modified because of svn:mergeinfo. You will
see such output then:

--- Recording mergeinfo for merge of r50050 into 'lib':
G lib
--- Eliding mergeinfo from 'lib':
U lib
--- Recording mergeinfo for merge of r50050 into 'log':
G log
--- Eliding mergeinfo from 'log':
U log

Here is now the way to fix it: re-apply the merge with --record-only
option to the exactly same revisions but on a complete working copy of
trunk with full depth. Before committing you will see on /trunk
something like:

Modified: svn:mergeinfo
Reverse-merged /branches/2011_L2:r49815*,49908*
Merged /branches/2011_L2:r49815,49908

Hope that details may help anyone else
Yves

Reply all
Reply to author
Forward
0 new messages