[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: Simon Large <simon.tortoisesvn_at_googlemail.com>
Date: Thu, 25 Sep 2008 21:43:48 +0100

2008/9/25 phahn <pjtr.hahn_at_googlemail.com>:
> 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.

Exactly. You can use -c200 for the forward merge, which is just as
valid as -r199:200, and -c -200 which is just as valid as -r200:199.
The command line client does support the same syntax.

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

Take a look at the subversion CHANGES file. Extract here.

* Improved merge performance for superfluous ranges (r32643)
* Better error message for 'Malformed URL for repository' (r31867, r32365)
* Improved svn:externals parsing (r32672, -673, -674, -739)
* fixed: improper ordering in 'svnlook diff' output (r32019)

Here you clearly see a revision interpreted as a changeset, and that
is core subversion, so you can't claim that only TSVN users think this
way. You seem to think that specifying a set of changes can only be
done using the -r syntax, but it is not the case.

If you were merging the changes listed above then from the log dialog
you would select exactly the revisions listed.


:       ___
:  oo  // \\      "De Chelonian Mobile"
: (_,\/ \_/ \     TortoiseSVN
:   \ \_/_\_/>    The coolest Interface to (Sub)Version Control
:   /_/   \_\     http://tortoisesvn.net
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:43:56 CEST

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