I have a mergeinfo elision scenario that is behaving in a manner
I do not understand.
I have a clean checkout of a branch (to eliminate any
mixed revision working copy behavior):
$ svn co [URL redacted]/myproject/branches/X
$ cd X
The difference in the mergeinfo, between subdir and subdir/A,
is revision 1489-2779 (inclusive)
$ svn pg 'svn:mergeinfo' subdir
/myproject/branches/W/subdir:1488-2675
/myproject/branches/Y/subdir:5925-7118
/myproject/trunk/subdir:2780-7532
$
$ svn pg 'svn:mergeinfo' subdir/A
/myproject/branches/W/subdir/A:1488-2675
/myproject/branches/Y/subdir/A:5925-7118
/myproject/trunk/subdir/A:1489-7532
The only difference in the merge info is "subdir/A" contains
the merge range between 1489 and 2779 (inclusive), where "subdir"
does not contain that same merge range.
So, based on the information at this url:
http://www.collab.net/community/subversion/articles/merge-info.html
...I would expect that merging revisions 1489-2779 (inclusive)
into "subdir", would cause the mergeinfo on "subdir/A" to elide.
This does not appear to be the case.
In fact, the merge changed nothing.
svn merge -r 1488:2779 ^/myproject/trunk/subdir subdir
--- Recording mergeinfo for merge of r1489 through r2675 into 'subdir':
U subdir
svn diff
[No output]
Perhaps this behavior is somehow related
to natural history / implicit mergeinfo?
In revision 1488
^/myproject/branches/W was created
via a copy from ^/myproject/trunk_at_1487
In revision 2768
^/myproject/branches/X was created via
a copy from ^/myproject/trunk_at_1487
In revision 2780
^/myproject/trunk was replaced via
a copy from ^/myproject/branches/W_at_2675
svn --version
svn, version 1.7.3 (r1242825)
svnserve --version
svnserve, version 1.7.3 (r1242825)
Any clarification would be greatly appreciated!
Thanks,
John
Received on 2012-03-23 22:26:41 CET