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

Re: Possible bugs in log -g

From: Mark Phippard <markphip_at_gmail.com>
Date: Mon, 18 Feb 2008 16:52:42 -0500

On Feb 18, 2008 4:43 PM, Hyrum K. Wright <hyrum_wright_at_mail.utexas.edu> wrote:
> [I'll look at all the problems, but I wan to take them one at a time to
> avoid possible dependencies.]
> Mark Phippard wrote:
> ...
> > 2) Too much mergeinfo. Incorrect filtering?
> >
> > svn log -g -r17 trunk
> >
> > This should really just show r16, but winds up showing a ton more.
> > r15 gets pulled in and this was a big synch up merge from trunk. So
> > this should get filtered out.
> I get the following:
> $ svn pg svn:mergeinfo trunk/
> /branches/a:3-11
> /branches/b:10-13
> /branches/c:5-16
> /trunk:2
> $ svn pg svn:mergeinfo trunk/@16
> /branches/a:3-11
> /branches/b:10-13
> /trunk:2
> And the mergeinfo diff as detected by 'log -g' is '/branches/c:5-16',
> which is correct, and that's the history that it is tracing. Maybe you
> could help me understand why should we not pull in everything, all of
> 5-16. If we should stop somewhere, how do we tell when to stopping
> tracing history?

I saw the same history, and I do not really know the answer. Clearly
the current output is wrong (in my opinion). /branches/c only has
three points of history.

r5 branch was created from /trunk
r15 branch was caught up with changes on /trunk
r16 a change was made

I would assume r5 and the information it brings with it should be
pretty easy to exclude.

r15 is the real question. I guess you would have to see that r15 was
a merge that came from the same location you are checking the logs
for, and know to exclude it.

Put another way. If I were looking at the history of /branches/c I
would expect it to show r15 and what that revision merged into the
branch. But when looking at the history of /trunk, it seems wrong to
show the revisions where something happened on the branch that came
from trunk.

Mark Phippard
To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org
Received on 2008-02-18 22:52:53 CET

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.