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

RE: Merge - Revision range calculation

From: Bob Archer <Bob.Archer_at_amsi.com>
Date: Fri, 30 Apr 2010 10:02:53 -0400

> Using: TortoiseSVN 1.6.99, Build 19370 - 32 Bit -dev, 2010/04/27 02:11:52
>
> I've just noticed some strange behaviour in the calculation of the
> "Revision range" when merging. If I use the "Show log" option for the
> source, and select a continuous block of revisions (for example, r100 to
> r110), then the revision range shows "100-110. This happens even if r102-
> 105 aren't actually in the list (because they were on a different branch).

They aren't really "on a different branch". The revision number is repository wide. It just happens that there are no changes in the path you are looking at for those revisions.

> If, however, I select the same block (r100 to r110), but then (using
> Ctrl), select another revision outside that block (r115), I would expect
> the revision range to appear as:
>
> 100-110,115
>
> But, it actually appears as:
>
> 100-101,106-110,115
>
> Is it possible for the revision range to be calculated based on the
> start/end ranges of what is selected, regardless of whether there are
> missing blocks in the range?

That strange. I'm guessing that once you break the range it is selecting those revisions specifically selected in the log. As a work around select the first range, merge it, then do another merge and select 115 (or whatever.)

Either way the same changes are going to be merged in.

BOb

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2599764

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2010-04-30 16:01:18 CEST

This is an archived mail posted to the TortoiseSVN Users mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.