[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 21:40:34 +0200

phahn wrote:
> On 25 Sep., 18:26, Stefan Küng <tortoise..._at_gmail.com> wrote:
>> We're not counting, we're merging revisions.
> No, we are merging the CHANGES that happened between revisions! That
> is an important difference and I think this is the cause you are
> missunderstanding my point. Maybe this is also the cause this is
> preferred by TSVN because people seam to think of a revision of
> something to click on in a list.

Most users merge revisions. They select a change in the log dialog which
is a 'revision' for them, and that revision is also the 'change' which
happened in that revision.

>>> 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
> Ok, I wasn't clear. The numbers are revisions in the sense of design
> of subversion.
> Maybe thats our major source of misunderstanding here.

I know how Subversion handles this, but TSVN handles it differently: the
way most users understand it.

>> Also, have you seen the checkbox 'reverse merge' ?
>> If the merge dialog would work as you want, that checkbox would have to
>> go away.
> Why should that not work? Where is the problem with that?
> It should work the same way like svn merge -r200:199 or svn merge -c
> -200.

* user selects revisions 5,6,7 from the log dialog
* log dialog puts 5-7 in the revision box
* user clicks on "reverse merge"

big question: should TSVN now do the merge as 7:5 or 7:4 ?

If we'd handle the ranges as you want, we would merge the wrong revisions.

>> 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?
> Why is it necessary for the log dialog to know this?
> Just select 199 and 200 and you can merge eihter way, back and forth
> and round.

With your interpretation, 199-200 would mean merging revision 200. No
way to 'reverse' that automatically.

> Calling it a revisions range is confusing everyone familiar with
> subversion but not with the specific interpretation used by TSVN. This
> is BAD. This is especially bad as it is nowhere state clearly that it
> has a different interpretation at all.

What's so difficult? You enter the revisions you want to merge. It's as
simple as that.

Search the mailing list back the last years and you will discover that
the way Subversion expects the merge revisions is not how users expect
it to work.

> I don't want the school of my childs to give them a math book
> interpreting integers like 2+2 = 5.

We're not dealing with doublespeak here. We're simply making it easier
for users to do a merge.


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

Received on 2008-09-25 21:41:11 CEST

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