[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: phahn <pjtr.hahn_at_googlemail.com>
Date: Thu, 25 Sep 2008 13:24:49 -0700 (PDT)

On 25 Sep., 21:40, Stefan Küng <tortoise..._at_gmail.com> wrote:
> * 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.

I don't understand the problem here. Just give that numbers to
subversion and merge like svn merge -r7:5 i.e. undo the changes of
changesets 6,7. Where is the problem?

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

It's not mine and not an interpretation. It's actually how subversion
is supposed to work.
Sorry I obviously don't understand you. I think this is just svn merge
-c -200 or svn merge -r200:199.

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

It's not difficult. It's just not what one is expecting then beiing
familiar with subversion but not with TSVN.

> 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.

The way Tortoise expects the merge revisions is not how user expect it
to work that are familiar with subversion and not just with one
possible client.

This is the same bad thing as people thinking VisualStudio == C++.

Why should one want that a client to fullfill the wrong expectations
users have about a system instead teaching them how the system really
is supposed to work.

To unsubscribe, e-mail: users-unsubscribe_at_tortoisesvn.tigris.org
For additional commands, e-mail: users-help_at_tortoisesvn.tigris.org
Received on 2008-09-25 22:24:57 CEST

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