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

Re: Log -g shows all revisions from source branch

From: Mark Phippard <markphip_at_gmail.com>
Date: Wed, 9 Dec 2009 08:48:17 -0500

On Mon, Dec 7, 2009 at 8:17 PM, Jacob Weber <jacob_at_jacobweber.com> wrote:
> Anyone have any other ideas? This is really frustrating. Here's another (simplified) example:
>
> * Created revision 101, by copying trunk at version 100 to branches/br1.
> * Committed revisions 102 and 103 to br1.
> * Merged from trunk into br1, creating revision 104.
> * Did a reintegrate merge from br1 into trunk, creating revision 105.
> * Ran "svn log -r 105 -g /trunk".
>
> This showed me 105, and all the revisions that were merged via 105. This included 104, 103, 102, and 101 (as I would expect), but then it continued showing the entire history of trunk.
>
> At revision 105, trunk's mergeinfo property looks like:
>
>    /branches/br0:80-90
>    /branches/br1:100-104
>
> At revision 104, it looked like:
>
>    /branches/br0:80-90
>    /trunk:1-79

The problem appears to be here ^. You should not have mergeinfo for
the natural history of an item nor should you have "self-referential"
mergeinfo. There have been various fixes to prevent this from being
created, but that does not have a way to fix it for existing
revisions.

-- 
Thanks
Mark Phippard
http://markphip.blogspot.com/
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=2428858
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-12-09 14:49:24 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.