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

Re: [Issue 3010] New - svn log -g gives inconsistent merge info

From: Karl Fogel <kfogel_at_red-bean.com>
Date: 2007-11-05 20:09:52 CET

mstrap@tigris.org writes:
> SVN r27021 from trunk. With the attached test repository, 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.

I'd like to understand this, but I'm embarrassed to say that I cannot
figure out what the log -g output means. Presumably r25 cannot be the
commit that resulted from merging the r35 changes, since r35 postdates
r25.

When I see this, for example:

   ----------------------------------------------------------------------
   r43 | strapetz | 2007-10-02 20:48:31 -0700 (Tue, 02 Oct 2007) | 1 line
   Changed paths:
      M /merge/branches/b21/file1.txt
   Result of a merge from: r45
   
   Changed file1.txt in b21.
   ----------------------------------------------------------------------

I wonder how anything that happens in r43 can be the "result of a
merge from r45"?

I believe this is the second time this thread has come up, and that
when I asked these questions last time, we agreed on a new phrasing
that would be clearer, but then I never got around to making the
change. This time, once we agree on what the output means, I will
make the change right away!

To save time, below is the output of...

   $ svn log -gv file://`pwd`/svnrepos

...where 'svnrepos' is the repository you attached to the issue:

------------------------------------------------------------------------
r45 | strapetz | 2007-10-02 20:51:48 -0700 (Tue, 02 Oct 2007) | 1 line
Changed paths:
   M /merge/trunk
   M /merge/trunk/file1.txt

Merged changes from b21.
------------------------------------------------------------------------
r44 | strapetz | 2007-10-02 20:48:38 -0700 (Tue, 02 Oct 2007) | 1 line
Changed paths:
   M /merge/branches/b21/file1.txt
Result of a merge from: r45

Changed file1.txt in b21.
------------------------------------------------------------------------
r43 | strapetz | 2007-10-02 20:48:31 -0700 (Tue, 02 Oct 2007) | 1 line
Changed paths:
   M /merge/branches/b21/file1.txt
Result of a merge from: r45

Changed file1.txt in b21.
------------------------------------------------------------------------
r42 | strapetz | 2007-10-02 20:48:20 -0700 (Tue, 02 Oct 2007) | 1 line
Changed paths:
   M /merge/branches/b21/file1.txt
Result of a merge from: r45

Changed file1.txt in b21.
------------------------------------------------------------------------
r40 | strapetz | 2007-10-02 20:47:36 -0700 (Tue, 02 Oct 2007) | 1 line
Changed paths:
   M /merge/branches/b21/file1.txt
Result of a merge from: r45

Changed file1.txt in b21.
------------------------------------------------------------------------
r39 | strapetz | 2007-10-02 20:47:27 -0700 (Tue, 02 Oct 2007) | 1 line
Changed paths:
   M /merge/branches/b21/file1.txt
Result of a merge from: r45

Changed file1.txt in b21.
------------------------------------------------------------------------
r38 | strapetz | 2007-10-02 20:47:07 -0700 (Tue, 02 Oct 2007) | 1 line
Changed paths:
   M /merge/branches/b21/file1.txt
Result of a merge from: r45

Changed file1.txt in b21.
------------------------------------------------------------------------
r37 | strapetz | 2007-10-02 20:46:57 -0700 (Tue, 02 Oct 2007) | 1 line
Changed paths:
   M /merge/branches/b21/file1.txt
Result of a merge from: r45

Changed file1.txt in b21.
------------------------------------------------------------------------
r44 | strapetz | 2007-10-02 20:48:38 -0700 (Tue, 02 Oct 2007) | 1 line
Changed paths:
   M /merge/branches/b21/file1.txt

Changed file1.txt in b21.
------------------------------------------------------------------------
r43 | strapetz | 2007-10-02 20:48:31 -0700 (Tue, 02 Oct 2007) | 1 line
Changed paths:
   M /merge/branches/b21/file1.txt

Changed file1.txt in b21.
------------------------------------------------------------------------
r42 | strapetz | 2007-10-02 20:48:20 -0700 (Tue, 02 Oct 2007) | 1 line
Changed paths:
   M /merge/branches/b21/file1.txt

Changed file1.txt in b21.
------------------------------------------------------------------------
r41 | strapetz | 2007-10-02 20:48:04 -0700 (Tue, 02 Oct 2007) | 1 line
Changed paths:
   M /merge2/trunk/file1.txt

Changed file1.txt.
------------------------------------------------------------------------
r40 | strapetz | 2007-10-02 20:47:36 -0700 (Tue, 02 Oct 2007) | 1 line
Changed paths:
   M /merge/branches/b21/file1.txt

Changed file1.txt in b21.
------------------------------------------------------------------------
r39 | strapetz | 2007-10-02 20:47:27 -0700 (Tue, 02 Oct 2007) | 1 line
Changed paths:
   M /merge/branches/b21/file1.txt

Changed file1.txt in b21.
------------------------------------------------------------------------
r38 | strapetz | 2007-10-02 20:47:07 -0700 (Tue, 02 Oct 2007) | 1 line
Changed paths:
   M /merge/branches/b21/file1.txt

Changed file1.txt in b21.
------------------------------------------------------------------------
r37 | strapetz | 2007-10-02 20:46:57 -0700 (Tue, 02 Oct 2007) | 1 line
Changed paths:
   M /merge/branches/b21/file1.txt

Changed file1.txt in b21.
------------------------------------------------------------------------
r36 | strapetz | 2007-10-02 17:13:58 -0700 (Tue, 02 Oct 2007) | 1 line
Changed paths:
   M /merge/trunk
   M /merge/trunk/file1.txt

Merged changes from b21 to trunk; manipluated mergeinfo: skipped complete /merge/branches/b22 line
------------------------------------------------------------------------
r35 | strapetz | 2007-10-02 17:07:49 -0700 (Tue, 02 Oct 2007) | 1 line
Changed paths:
   M /merge/branches/b21
   M /merge/branches/b21/file1.txt
Result of a merge from: r36

Merged changes from b22 to b21; manipluated mergeinfo: skipped complete /merge/branches/b23 line
------------------------------------------------------------------------
r34 | strapetz | 2007-10-02 17:04:49 -0700 (Tue, 02 Oct 2007) | 1 line
Changed paths:
   M /merge/branches/b22
   M /merge/branches/b22/file1.txt
Result of a merge from: r36, r35

Merged changed from b23 to b22.
------------------------------------------------------------------------
r33 | strapetz | 2007-10-02 17:03:52 -0700 (Tue, 02 Oct 2007) | 1 line
Changed paths:
   M /merge/branches/b23/file1.txt
Result of a merge from: r36, r35, r34

Modified file.txt in b23.
------------------------------------------------------------------------
r25 | strapetz | 2007-10-02 16:31:05 -0700 (Tue, 02 Oct 2007) | 1 line
Changed paths:
   M /merge/branches/b23/file1.txt
Result of a merge from: r36, r35

Modified file1.txt in b23.
------------------------------------------------------------------------
r35 | strapetz | 2007-10-02 17:07:49 -0700 (Tue, 02 Oct 2007) | 1 line
Changed paths:
   M /merge/branches/b21
   M /merge/branches/b21/file1.txt

Merged changes from b22 to b21; manipluated mergeinfo: skipped complete /merge/branches/b23 line
------------------------------------------------------------------------
r34 | strapetz | 2007-10-02 17:04:49 -0700 (Tue, 02 Oct 2007) | 1 line
Changed paths:
   M /merge/branches/b22
   M /merge/branches/b22/file1.txt
Result of a merge from: r35

Merged changed from b23 to b22.
------------------------------------------------------------------------
r33 | strapetz | 2007-10-02 17:03:52 -0700 (Tue, 02 Oct 2007) | 1 line
Changed paths:
   M /merge/branches/b23/file1.txt
Result of a merge from: r35, r34

Modified file.txt in b23.
------------------------------------------------------------------------
r34 | strapetz | 2007-10-02 17:04:49 -0700 (Tue, 02 Oct 2007) | 1 line
Changed paths:
   M /merge/branches/b22
   M /merge/branches/b22/file1.txt

Merged changed from b23 to b22.
------------------------------------------------------------------------
r33 | strapetz | 2007-10-02 17:03:52 -0700 (Tue, 02 Oct 2007) | 1 line
Changed paths:
   M /merge/branches/b23/file1.txt
Result of a merge from: r34

Modified file.txt in b23.
------------------------------------------------------------------------
r33 | strapetz | 2007-10-02 17:03:52 -0700 (Tue, 02 Oct 2007) | 1 line
Changed paths:
   M /merge/branches/b23/file1.txt

Modified file.txt in b23.
------------------------------------------------------------------------
r32 | strapetz | 2007-10-02 16:59:32 -0700 (Tue, 02 Oct 2007) | 1 line
Changed paths:
   M /merge/trunk
   M /merge/trunk/file1.txt

Merged changes from b21; manipulated merge-info: Rest for b22 from 24-30 back to 24-26
------------------------------------------------------------------------
r31 | strapetz | 2007-10-02 16:42:28 -0700 (Tue, 02 Oct 2007) | 1 line
Changed paths:
   M /merge/branches/b21
   M /merge/branches/b21/file1.txt
Result of a merge from: r32

Merged changes from b22.
------------------------------------------------------------------------
r30 | strapetz | 2007-10-02 16:41:29 -0700 (Tue, 02 Oct 2007) | 1 line
Changed paths:
   M /merge/branches/b22/file1.txt
Result of a merge from: r32, r31

Changed file1.txt in b22.
------------------------------------------------------------------------
r31 | strapetz | 2007-10-02 16:42:28 -0700 (Tue, 02 Oct 2007) | 1 line
Changed paths:
   M /merge/branches/b21
   M /merge/branches/b21/file1.txt

Merged changes from b22.
------------------------------------------------------------------------
r30 | strapetz | 2007-10-02 16:41:29 -0700 (Tue, 02 Oct 2007) | 1 line
Changed paths:
   M /merge/branches/b22/file1.txt
Result of a merge from: r31

Changed file1.txt in b22.
------------------------------------------------------------------------
r30 | strapetz | 2007-10-02 16:41:29 -0700 (Tue, 02 Oct 2007) | 1 line
Changed paths:
   M /merge/branches/b22/file1.txt

Changed file1.txt in b22.
------------------------------------------------------------------------
r29 | strapetz | 2007-10-02 16:39:10 -0700 (Tue, 02 Oct 2007) | 1 line
Changed paths:
   M /merge/trunk/file1.txt

Modified file1.txt in trunk.
------------------------------------------------------------------------
r28 | strapetz | 2007-10-02 16:34:25 -0700 (Tue, 02 Oct 2007) | 1 line
Changed paths:
   M /merge/trunk
   M /merge/trunk/file1.txt

Merged changes from b21 to trunk
------------------------------------------------------------------------
r27 | strapetz | 2007-10-02 16:33:57 -0700 (Tue, 02 Oct 2007) | 1 line
Changed paths:
   M /merge/branches/b21
   M /merge/branches/b21/file1.txt
Result of a merge from: r28

Merged changes from b22 to b21
------------------------------------------------------------------------
r26 | strapetz | 2007-10-02 16:33:20 -0700 (Tue, 02 Oct 2007) | 1 line
Changed paths:
   M /merge/branches/b22
   M /merge/branches/b22/file1.txt
Result of a merge from: r28, r27

Merged changes from b23 to b22
------------------------------------------------------------------------
r25 | strapetz | 2007-10-02 16:31:05 -0700 (Tue, 02 Oct 2007) | 1 line
Changed paths:
   M /merge/branches/b23/file1.txt
Result of a merge from: r28, r27, r26

Modified file1.txt in b23.
------------------------------------------------------------------------
r27 | strapetz | 2007-10-02 16:33:57 -0700 (Tue, 02 Oct 2007) | 1 line
Changed paths:
   M /merge/branches/b21
   M /merge/branches/b21/file1.txt

Merged changes from b22 to b21
------------------------------------------------------------------------
r26 | strapetz | 2007-10-02 16:33:20 -0700 (Tue, 02 Oct 2007) | 1 line
Changed paths:
   M /merge/branches/b22
   M /merge/branches/b22/file1.txt
Result of a merge from: r27

Merged changes from b23 to b22
------------------------------------------------------------------------
r25 | strapetz | 2007-10-02 16:31:05 -0700 (Tue, 02 Oct 2007) | 1 line
Changed paths:
   M /merge/branches/b23/file1.txt
Result of a merge from: r27, r26

Modified file1.txt in b23.
------------------------------------------------------------------------
r26 | strapetz | 2007-10-02 16:33:20 -0700 (Tue, 02 Oct 2007) | 1 line
Changed paths:
   M /merge/branches/b22
   M /merge/branches/b22/file1.txt

Merged changes from b23 to b22
------------------------------------------------------------------------
r25 | strapetz | 2007-10-02 16:31:05 -0700 (Tue, 02 Oct 2007) | 1 line
Changed paths:
   M /merge/branches/b23/file1.txt
Result of a merge from: r26

Modified file1.txt in b23.
------------------------------------------------------------------------
r25 | strapetz | 2007-10-02 16:31:05 -0700 (Tue, 02 Oct 2007) | 1 line
Changed paths:
   M /merge/branches/b23/file1.txt

Modified file1.txt in b23.
------------------------------------------------------------------------
r24 | strapetz | 2007-10-02 16:30:02 -0700 (Tue, 02 Oct 2007) | 1 line
Changed paths:
   A /merge/branches/b23 (from /merge/trunk:21)

Created branch b23
------------------------------------------------------------------------
r23 | strapetz | 2007-10-02 16:29:55 -0700 (Tue, 02 Oct 2007) | 1 line
Changed paths:
   A /merge/branches/b22 (from /merge/trunk:21)

Created branch b22
------------------------------------------------------------------------
r22 | strapetz | 2007-10-02 16:29:48 -0700 (Tue, 02 Oct 2007) | 1 line
Changed paths:
   A /merge/branches/b21 (from /merge/trunk:21)

Created branch b21
------------------------------------------------------------------------
r21 | strapetz | 2007-08-22 16:33:05 -0700 (Wed, 22 Aug 2007) | 1 line
Changed paths:
   M /merge2/trunk/dir1
   M /merge2/trunk/dir1/file2.txt
   M /merge2/trunk/dir2
   M /merge2/trunk/dir2/file3.txt

Merged changes from b15 and b18
------------------------------------------------------------------------
r20 | strapetz | 2007-08-22 16:30:49 -0700 (Wed, 22 Aug 2007) | 1 line
Changed paths:
   M /merge2/branches/b18/dir2/file3.txt
Result of a merge from: r21

Modified file3
------------------------------------------------------------------------
r18 | strapetz | 2007-08-22 16:29:35 -0700 (Wed, 22 Aug 2007) | 1 line
Changed paths:
   M /merge2/branches/b15/dir1/file2.txt
Result of a merge from: r21

Modified file2
------------------------------------------------------------------------
r20 | strapetz | 2007-08-22 16:30:49 -0700 (Wed, 22 Aug 2007) | 1 line
Changed paths:
   M /merge2/branches/b18/dir2/file3.txt

Modified file3
------------------------------------------------------------------------
r19 | strapetz | 2007-08-22 16:30:07 -0700 (Wed, 22 Aug 2007) | 1 line
Changed paths:
   A /merge2/branches/b18 (from /merge2/trunk:18)

Created branch b18
------------------------------------------------------------------------
r18 | strapetz | 2007-08-22 16:29:35 -0700 (Wed, 22 Aug 2007) | 1 line
Changed paths:
   M /merge2/branches/b15/dir1/file2.txt

Modified file2
------------------------------------------------------------------------
r17 | strapetz | 2007-08-22 16:28:33 -0700 (Wed, 22 Aug 2007) | 1 line
Changed paths:
   M /merge2/trunk/dir1/file2.txt

Modified file2
------------------------------------------------------------------------
r16 | strapetz | 2007-08-22 16:27:17 -0700 (Wed, 22 Aug 2007) | 1 line
Changed paths:
   A /merge2/branches/b15 (from /merge2/trunk:14)

Created branch b15
------------------------------------------------------------------------
r15 | strapetz | 2007-08-22 16:27:09 -0700 (Wed, 22 Aug 2007) | 1 line
Changed paths:
   A /merge2/branches

Created branches
------------------------------------------------------------------------
r14 | strapetz | 2007-08-22 16:25:43 -0700 (Wed, 22 Aug 2007) | 1 line
Changed paths:
   A /merge2/trunk/dir1
   A /merge2/trunk/dir1/file2.txt
   A /merge2/trunk/dir2
   A /merge2/trunk/dir2/file3.txt
   A /merge2/trunk/file1.txt

Initial import of merge2.
------------------------------------------------------------------------
r13 | strapetz | 2007-08-22 16:24:36 -0700 (Wed, 22 Aug 2007) | 1 line
Changed paths:
   A /merge2/trunk

Created directory merge2/trunk
------------------------------------------------------------------------
r12 | strapetz | 2007-08-22 16:24:32 -0700 (Wed, 22 Aug 2007) | 1 line
Changed paths:
   A /merge2

Created directory merge2
------------------------------------------------------------------------
r11 | strapetz | 2007-08-22 15:25:07 -0700 (Wed, 22 Aug 2007) | 1 line
Changed paths:
   M /merge/trunk/dir
   M /merge/trunk/dir/file2.txt
   M /merge/trunk/dir/file3.txt

Merged changes from b4 to trunk
------------------------------------------------------------------------
r10 | strapetz | 2007-08-22 15:23:12 -0700 (Wed, 22 Aug 2007) | 1 line
Changed paths:
   M /merge/branches/b4
   M /merge/branches/b4/dir
   M /merge/branches/b4/dir/file2.txt
   M /merge/branches/b4/dir/file3.txt
Result of a merge from: r11

Merged changes from b7 to b4
------------------------------------------------------------------------
r9 | strapetz | 2007-08-22 15:19:15 -0700 (Wed, 22 Aug 2007) | 1 line
Changed paths:
   M /merge/branches/b7/dir/file2.txt
   M /merge/branches/b7/dir/file3.txt
Result of a merge from: r11, r10

Some changes in b7.
------------------------------------------------------------------------
r7 | strapetz | 2007-08-22 15:18:33 -0700 (Wed, 22 Aug 2007) | 1 line
Changed paths:
   M /merge/branches/b4/dir/file2.txt
   M /merge/branches/b4/dir/file3.txt
Result of a merge from: r11

Some changes in b4.
------------------------------------------------------------------------
r10 | strapetz | 2007-08-22 15:23:12 -0700 (Wed, 22 Aug 2007) | 1 line
Changed paths:
   M /merge/branches/b4
   M /merge/branches/b4/dir
   M /merge/branches/b4/dir/file2.txt
   M /merge/branches/b4/dir/file3.txt

Merged changes from b7 to b4
------------------------------------------------------------------------
r9 | strapetz | 2007-08-22 15:19:15 -0700 (Wed, 22 Aug 2007) | 1 line
Changed paths:
   M /merge/branches/b7/dir/file2.txt
   M /merge/branches/b7/dir/file3.txt
Result of a merge from: r10

Some changes in b7.
------------------------------------------------------------------------
r3 | strapetz | 2007-08-22 15:16:00 -0700 (Wed, 22 Aug 2007) | 1 line
Changed paths:
   A /merge/trunk/dir
   A /merge/trunk/dir/file2.txt
   A /merge/trunk/dir/file3.txt
   A /merge/trunk/file1.txt
Result of a merge from: r10

Initial import of merge.
------------------------------------------------------------------------
r9 | strapetz | 2007-08-22 15:19:15 -0700 (Wed, 22 Aug 2007) | 1 line
Changed paths:
   M /merge/branches/b7/dir/file2.txt
   M /merge/branches/b7/dir/file3.txt

Some changes in b7.
------------------------------------------------------------------------
r8 | strapetz | 2007-08-22 15:18:44 -0700 (Wed, 22 Aug 2007) | 1 line
Changed paths:
   A /merge/branches/b7 (from /merge/branches/b4:7)

Created branch b7.
------------------------------------------------------------------------
r7 | strapetz | 2007-08-22 15:18:33 -0700 (Wed, 22 Aug 2007) | 1 line
Changed paths:
   M /merge/branches/b4/dir/file2.txt
   M /merge/branches/b4/dir/file3.txt

Some changes in b4.
------------------------------------------------------------------------
r6 | strapetz | 2007-08-22 15:17:32 -0700 (Wed, 22 Aug 2007) | 1 line
Changed paths:
   A /merge/branches/b4 (from /merge/trunk:4)

Created branch b4.
------------------------------------------------------------------------
r5 | strapetz | 2007-08-22 15:17:31 -0700 (Wed, 22 Aug 2007) | 1 line
Changed paths:
   A /merge/branches

Created directory b4.
------------------------------------------------------------------------
r4 | strapetz | 2007-08-22 15:16:41 -0700 (Wed, 22 Aug 2007) | 1 line
Changed paths:
   D /dir

Deleted dir
------------------------------------------------------------------------
r3 | strapetz | 2007-08-22 15:16:00 -0700 (Wed, 22 Aug 2007) | 1 line
Changed paths:
   A /merge/trunk/dir
   A /merge/trunk/dir/file2.txt
   A /merge/trunk/dir/file3.txt
   A /merge/trunk/file1.txt

Initial import of merge.
------------------------------------------------------------------------
r2 | strapetz | 2007-08-22 15:15:38 -0700 (Wed, 22 Aug 2007) | 1 line
Changed paths:
   A /merge
   A /merge/trunk

Created directory merge/trunk
------------------------------------------------------------------------
r1 | strapetz | 2007-08-22 15:04:09 -0700 (Wed, 22 Aug 2007) | 1 line
Changed paths:
   A /dir

Created directory dir
------------------------------------------------------------------------

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Mon Nov 5 20:10:10 2007

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