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

Re: BUG: Wrong merge range

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: Wed, 24 Sep 2008 19:19:01 +0200

phahn wrote:
> On Sep 19, 1:51 pm, "Jean-Marc van Leerdam"
> <j.m.van.leer..._at_gmail.com> wrote:
>> Not a bug, but a difference in interpretation. TSVN assumes users talk
>> about a revision as 'all the changes that were committed in that
>> revision'. When merging, you say 'I want to merge the changes made in
>> revisions x through y'. In SVN you must supply two revisions to
>> indicate 'all changes made after revision X up to and including Y'.
> Who says this? Where can I find an official statement what
> interpretation is assumed by TSVN?
> As I said already. The help installed with the client is saying
> something different and describes the same intepretation the official
> svn client is using.

It doesn't say something different (I just checked). But it doesn't say
how the entered revisions are used either.

If you look at the label below the edit box, it says:

Use the log dialog to select the revisions you want to merge, or enter
the revisions to merge, separated by commas. A revision range can be
specified by a dash.

Example: 4-7,9,11,15-HEAD

If you look at the example, it should be clear that all revisions are
used, otherwise (in the example) revision 9 and 11 wouldn't be merged.

> I agree that this maybe could be an configuration option, but I think
> this is to important to have the default behaviour deviate from that
> of the official client.

We had this discussion before, and the majority of our users wanted the
merge to work like it works now.


  oo  // \\      "De Chelonian Mobile"
 (_,\/ \_/ \     TortoiseSVN
   \ \_/_\_/>    The coolest Interface to (Sub)Version Control
   /_/   \_\     http://tortoisesvn.net

Received on 2008-09-24 19:19:24 CEST

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