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

Log -g shows all revisions from source branch

From: Jacob Weber <jacob_at_jacobweber.com>
Date: Sun, 22 Nov 2009 13:57:04 -0800 (PST)

I'm running the following command, to show the latest revision in my branch, plus the merged revisions from the trunk that it included:
  svn log -l1 -g /branches/br1

But it ends up showing me ALL revisions in the trunk, and so it takes forever. I'm wondering if someone can tell me why this is happening, and whether there's a way to stop it.

My branch br1 was copied from the trunk at r11198.

Since then, there have been three commits to the trunk, r11199, 11201, and 11499. That last one was a reintegrate merge from a different branch, br2, so it added the following svn:mergeinfo property to trunk:
  /branches/br2:10359-11498

Following that last commit, I merged trunk into br1, and committed it as r11503. So br1 now has the following svn:mergeinfo property:
  /branches/br2:10359-11498
    /trunk:11198-11502

This all looks correct to me. But when I run that log command on the branch, it shows the latest revision, r11503, then shows ALL revisions of the trunk, down to when it was created at r2314. They all say "Merged via: r11503", although some of them include additional revisions in that "merged via" list.

Could it be trying to follow br2's history? That branch has a svn:mergeinfo property:
 /trunk:2314-11334
which DOES include all revisions. But that property wasn't propagated to the trunk or to br1. Could my log command still be following it?

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=2423120

Please start new threads on the <users_at_subversion.apache.org> mailing list.
To subscribe to the new list, send an empty e-mail to <users-subscribe_at_subversion.apache.org>.
Received on 2009-11-22 22:58:00 CET

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

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