[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 "via" revisions too far back

From: C. Michael Pilato <cmpilato_at_collab.net>
Date: Tue, 06 May 2008 18:27:36 -0700

I think there is a bug.

I think that bug is *not* in 'svn log -g'.

There seems to be a regression in 'svn merge' itself. I've attached a
recipe script which I believe models the version history of your test
repository. I get the same svn:mergeinfo results that you show below. The
problem is that those results are wrong. We shouldn't be storing explicit
mergeinfo that is redundant with a path's natural history (its implicit
mergeinfo), and most of what you see in that svn:mergeinfo below is redundant.

> > Short of the whole repository, can you provide the output of 'svn pget
> > -R svn:mergeinfo REPOS-ROOT-URL'?
>
> It's just:
>
> svn://localhost/test/branches/b1 - /test/branches/b1:3-5
> /test/branches/b2:6-9
> /test/trunk:2
>
> It's not yet present at r9, but is created by the following merge:
>
> svn merge svn://localhost/test/branches/b2 b1
>
> The interesting part of the log (without -g) might be:
>
> ------------------------------------------------------------------------
> r6 | (no author) | 2008-04-29 02:59:14 +0200 (Tue, 29 Apr 2008) | 1 line
> Changed paths:
> A /test/branches/b2 (from /test/branches/b1:5)
>
> Created branch b2
> ------------------------------------------------------------------------
> r5 | (no author) | 2008-04-29 02:59:13 +0200 (Tue, 29 Apr 2008) | 1 line
> Changed paths:
> M /test/branches/b1/file1.txt
>
> Changed (2) b1/file1.txt
> ------------------------------------------------------------------------
> r4 | (no author) | 2008-04-29 02:59:12 +0200 (Tue, 29 Apr 2008) | 1 line
> Changed paths:
> M /test/branches/b1/file1.txt
>
> Changed (1) b1/file1.txt
> ------------------------------------------------------------------------
> r3 | (no author) | 2008-04-29 02:59:10 +0200 (Tue, 29 Apr 2008) | 1 line
> Changed paths:
> A /test/branches/b1 (from /test/trunk:2)
>
> Created branch b1
> ------------------------------------------------------------------------
>
> --
> Best regards,
> Marc Strapetz
> _____________
> SyntEvo GmbH
> www.syntevo.com
>
>
>
> C. Michael Pilato wrote:
>> Marc Strapetz wrote:
>>> For a test repository created with RC5, a branch b2 has been forked
>>> off from a branch b1 at r5 (committed at r6). Changes from b2 are
>>> merged back to b1 and are committed at r10. Now log -g on the
>>> repository root shows r9-r3 as "Merged via: r10" -- I would expect to
>>> only get r9-r7 as "Merged via: r10". I can supply the corresponding
>>> test repository.
>>
>> Short of the whole repository, can you provide the output of 'svn pget
>> -R svn:mergeinfo REPOS-ROOT-URL'?
>>

-- 
C. Michael Pilato <cmpilato_at_collab.net>
CollabNet   <>   www.collab.net   <>   Distributed Development On Demand

Received on 2008-05-07 03:27:52 CEST

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