Cherry picking merges vs. SVN log -g

Hi @dev,

as I understand, svn log -g will include the tree
of merge source revisions in its output. Will those
merged revisions be reported with *all* paths
changed in that revision or just with those
that affected the merge?

Example. Log w/o merge info (ignore incorrect
formatting, this is just a "pseudo-log"):

r10: some modification
M /foo/A.txt
M /bar/B.txt

r11: merge /bar into /baz
M /baz/B.txt

What of the following will be reported for r11 with
merge info included?

Variant 1. Full revision info:

r11: merge /bar into /baz
M /baz/B.txt

r10: some modification
merged into r11
M /foo/A.txt
M /bar/B.txt

Variant 2. Used source paths only:

r11: merge /bar into /baz
M /baz/B.txt

r10: some modification
merged into r11
M /bar/B.txt

Personally, I would prefer Variant 1 as it makes the
log caching extensions in TortoiseSVN much easier
to implement ;)

Regards,
Stefan^2.
Received on Sat Jun 2 13:39:06 2007