On Sat, May 1, 2010 at 12:02 AM, Bob Archer <Bob.Archer_at_amsi.com> wrote:
> > 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.
Yeah, I knew that. I meant "they" as an "those revisions' changes").
> > 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.
>
Thanks. I actually ended up just hand-coding the revision list manually
before doing the merge.
Cheers,
Daniel B.
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2600009
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2010-04-30 23:17:42 CEST