[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: Fri, 26 Sep 2008 14:07:49 +0100

2008/9/26 phahn <pjtr.hahn_at_googlemail.com>:
> One Problem of this is that TSVN is not consistent withhin the
> different possible ways of mergin in TSVN.
>
> 1.) "Merge a range of revisions" is the equivalent to svn merge -
> r:M //source/url/ //wc/path
>
> 2.) "Merge two different trees" is the equivalent to svn merge //
> sourceA/url_at_N //sourceA/url_at_M //wc/path
>
> 1.) and 2.) should be equivalent if both source urls point to the same
> place. In fact 2.) is the basic merge command in svn and all others
> are just shortcuts and therefor 1.) and 2.) are equivalents in svn.
>
> In TSVN this is not true, so you have different meanings of revision
> numbers within the same process.

There is no reason that we have to follow the particular command line
usage that you are used to. For merging two trees the only possible
way to specify it is by URL and revision, to identify two fixed states
of the repository, the same as your subversion command line.

For merging a range of revisions you can either consider a revision as
a changeset and use the -c notation, or you can consider a revision as
a state of the repository and you need two states to take the
difference. Both are equally valid, but the changeset notation is much
more natural when selecting revisions using the log dialog, which is
the easiest way with a GUI client. If the -c method was not valid or
uesful it would not even exist in the command line client.

Simon

-- 
:       ___
:  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-26 15:07:56 CEST

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