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

Odd merge ranges and message (was Re: svn commit: propchange - r32663 - svn:log)

From: Blair Zajac <blair_at_orcaware.com>
Date: Sat, 23 Aug 2008 12:48:34 -0700

arfrever_at_tigris.org wrote:
> Author: arfrever
> Revision: 32663
> Property Name: svn:log
> Action: modified
> Property diff:
> --- old property value
> +++ new property value
> @@ -1,4 +1,4 @@
> On the file externals branch.
> * branches/file-externals:
> - Merge r31705 through r32662 from trunk.
> + Merge r32660 through r32662 from trunk.

So this morning I did a merge from r32476 through r32659 on trunk into the
file-externals branch. Then I did two commits in trunk and then merged them
into the branch in a second commit.

The second merge gave a message on stdout that it was merging r31705 through
r32662 from trunk, which is odd, given that I just brought it up to date to
r32659. And I just copy the merge range into the svn commit message.

For example, the build.conf, there is no explicit mergeinfo from trunk

$ svn pg svn:mergeinfo
http://svn.collab.net/repos/svn/branches/file-externals/build.conf -r 32662 |
grep trunk | wc

$ svn pg svn:mergeinfo
http://svn.collab.net/repos/svn/branches/file-externals/build.conf -r 32663 |
grep trunk

build.conf was not modified between my commits and merges.

And then message:

$ svn diff -c 32663

Property changes on: build.conf
Modified: svn:mergeinfo
    Merged /trunk/build.conf:r31705-32662

This show's all the revisions from r31705 through 32662 were merged in, but this
file has been merged previously.

So why would it print 'r31705 through r32662' instead of 'r32660 through r32662'?


To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org
Received on 2008-08-23 21:48:57 CEST

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.