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

log -g problem when performed on files

From: Marc Strapetz <marc.strapetz_at_syntevo.com>
Date: Thu, 08 May 2008 15:22:45 +0200

When performing log -g on a single file it will return those "Merged
via" revisions from the merge sources where the file has actually been
changed (and that's great, btw). However, this seems not to work when
the svn:mergeinfo property had been committed later than the merge
changes itself. For example (using RC5):

------------------------------------------------------------------------
r7 | (no author) | 2008-04-29 07:20:50 +0200 (Tue, 29 Apr 2008) | 1 line
Changed paths:
    M /test/branches/b2/dir/file2.txt
    M /test/branches/b2/dir/file3.txt

Changed (3) test-b2/dir/file2.txt and test-b2/dir/file3.txt
------------------------------------------------------------------------

is reported when committing the merged changes together with svn:mergeinfo:

------------------------------------------------------------------------
r10 | (no author) | 2008-04-29 07:20:55 +0200 (Tue, 29 Apr 2008) | 1 line
Changed paths:
    M /test/branches/b1
    M /test/branches/b1/dir/file2.txt
    M /test/branches/b1/dir/file3.txt

Merged changes (3)-(5) from b2
------------------------------------------------------------------------

but not when committing svn:mergeinfo separately:

------------------------------------------------------------------------
r11 | (no author) | 2008-04-29 07:20:57 +0200 (Tue, 29 Apr 2008) | 1 line
Changed paths:
    M /test/branches/b1

Committed svn:mergeinfo
------------------------------------------------------------------------
r10 | (no author) | 2008-04-29 07:20:55 +0200 (Tue, 29 Apr 2008) | 1 line
Changed paths:
    M /test/branches/b1/dir/file2.txt
    M /test/branches/b1/dir/file3.txt

Merged changes (3)-(5) from b2
------------------------------------------------------------------------

I would expect r7 to be reported here as child of r11.

--
Best regards,
Marc Strapetz
_____________
SyntEvo GmbH
www.syntevo.com
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org
Received on 2008-05-08 15:23:07 CEST

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