[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Reverse merges and log -g

From: Paul Burba <ptburba_at_gmail.com>
Date: Mon, 21 Jul 2008 18:24:54 -0400

While looking at the recent fix for issue #3235 I entered some notes
in the issue regarding what I thought was a problem with log -g. But
now I'm not so sure...

...the question is:

Should log -g follow reverse merges?

For example, say we:

1) Merge -r3:5 from trunk to branch and commit as r6.

svn log -g -r6 branch includes r3 and r5 in its output, that seems
right. But what if we then:

2) Reverse merge -c-5 from 'branch' to 'trunk' and commit it as r7.

Should svn log -g -r7 branch (or any of it's child paths) show r5?
1.5.0 and trunk do show r5 when the log target is one of branch's
children, but not when the target is branch itself (obviously one or
the other is wrong it's just that I'm not sure which!). Since
'branch' has effectively never had r5 merged to it at this point,
isn't mentioning r5 misleading?

A concrete example can be found here:
http://subversion.tigris.org/issues/show_bug.cgi?id=3235#desc5

Paul

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org
Received on 2008-07-22 00:25:03 CEST

This is an archived mail posted to the Subversion Dev mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.