Re: svn log -g doesn't return merge info when operating against repository root

Henrik Carlqvist <hc528_at_poolhem.se> writes:

> On Wed, 25 Jul 2012 11:17:55 -0500
> Justin Johnson <justin_at_justinjohnson.io> wrote:
>
>> The command "svn log -vg" is not returning merge info when I execute
>> the command while sitting in a working copy of the root level of a
>> repository or when I pass in the URL to the root level of root level
>> on the command line. A simple test case can be seen below.
>
> Sorry for my reply to a really old post, but it seems as if no one else
> has replied and this problem also seems to still be there.

There is a behaviour change but I believe it is deliberate. Running log
without -g shows a certain set of revision. Adding -g causes log to
show more revision and those extra revision, and only those extra
revisions, are marked "Merged via". The "Merged via" marking indicates
that these revisions are not part of the direct history.

svnadmin create repo --compatible-version 1.6
svn mkdir -mm --parents file://`pwd`/repo/P/A # r1
svn cp -mm file://`pwd`/repo/P/A ^/P/B # r2
svn cp -mm file://`pwd`/repo/P/B ^/C # r3
svn mkdir -mm file://`pwd`/repo/C/X # r4
svn co file://`pwd`/repo wc
svn merge ^/C wc/P/B
svn ci -mm wc # r5
svn merge ^/P/B wc/P/A
svn ci -mm wc # r6

Log on ^/P/A shows revisions 6 and 1; adding -g includes the extra
revisions 2, 3, 4 and 5 marked "Merged via".

Log on ^/P shows revisions 6, 5, 2 and 1; adding -g includes 3 and 4
marked "Merged via".

Log on ^/ shows all revisions; adding -g includes no more revisions.

-- 
Philip Martin | Subversion Committer
WANdisco // *Non-Stop Data*