[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: Thu, 25 Sep 2008 18:26:29 +0200

phahn wrote:
>
> On Sep 25, 3:49 pm, "Simon Large" <simon.tortoise..._at_googlemail.com>
> wrote:
>> The behaviour for 'merge a range of revisions is similar to the -c
>> behaviour of the CLI where -c27 is interpreted as equivalent to
>> -r26:27.
>
> Exactly. And this makes perfect sense because it is called a
> 'changeset' and it means 'diff and apply' the changes that got me from
> 26 to 27.
> This is consistent.
>
> This has nothing to do with printing. Counting pages is counting of
> entities.

We're not counting, we're merging revisions.

> Revisions are no entities, they are points in time which represent a
> state.
> What we are interested in when we want to merge are not states but
> changes that occur between them and got us from A to B.
>
> Your analogy would be right if you would like to export or maybe even
> print things or such. Then you could say e.g. svn print -r5:10 foo.cpp
> and would get copies of that file at state 5,6,7,8,9,10.
>
> A better analogy to this would be paying electrical power.
> When I would ask you what you paid from 2000-2008 you wouldn't give me
> your meter readings from 1999-2008, would you?

No, but I would give you the meter readings for 2000, 2001, 2002, 2003,
2004, 2005, 2006, 2007 and 2008.
With your analogy, you would omit the year 2000.

> To get back to the changeset example.
> How would you specify -c in that system?
> -r6:8 in TSVN is 5-8, -r7:8 is 6-8 -- so to get something equivalent
> to -c8 you have to say -r8:8 if you want a consistent formulation.

Wrong.
-r6:8 in TSVN is 7-8, -r7:8 is 8.

Also, have you seen the checkbox 'reverse merge' ?
If the merge dialog would work as you want, that checkbox would have to
go away.
Also, selecting revisions to merge from the log dialog also wouldn't
work: how could the log dialog know whether the user wants to merge or
reverse-merge the selected revisions?

> Another simple expample:
> Give me all changes from the creation of the repository until now! In
> SVN world this is -r0:HEAD, what would that be in TSVN?

1-HEAD

Stefan

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

Received on 2008-09-25 18:27:24 CEST

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