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

Re: svn log -g gives inconsistent merge info

From: Hyrum K. Wright <hyrum_wright_at_mail.utexas.edu>
Date: 2007-10-10 23:45:34 CEST

Marc Strapetz wrote:
> I have performed various merges from branches to other branches and
> finally back to the trunk and now get following revisions for "svn log
> -g svn://localhost":
>
> r36
> r35 result of merge from r36
> r34 result of merge from r36, r35
> r33 result of merge from r36, r35, r34
> r25 result of merge from r36, r35
> r35
> r34 result of merge from r35
> r33 result of merge from r35, r34
> r34
> r33 result of merge from r34
> r33
> r32
> ...
>
> What is inconsistent here it that r25 is reported as result of merge
> from r35 (as part of r36 report), but it's not reported anymore for r35
> itself. I'm not sure whether r25 should actually be reported because I
> have played with svn:mergeinfo at r35 and at r36, but I would anyway not
> expect this mixture.

Marc,
Thanks for the testing and the report. Could you run 'svn log -gv' and
show the result? I'm curious to see which paths were affected by which
revisions. Alternatively, if the repo is such that you could post a
dumpfile somewhere I could download it from, I could poke at it myself.

Thanks,
-Hyrum

Received on Wed Oct 10 23:45:57 2007

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