[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: Sat, 27 Sep 2008 14:10:20 +0100

2008/9/27 phahn <pjtr.hahn_at_googlemail.com>:
> On 26 Sep., 15:07, "Simon Large" <simon.tortoise..._at_googlemail.com>
> wrote:
>> 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.
>
> That's all I that I want. Call the child by it's name!
>
> I don't doubt it's usefull to specify a list of changesets especially
> in a gui dialog. All I say is that a changeset != revision. Calling a
> list of changesets a revision range is totally misleading to all
> people that don't live in that TSVN bubble but just use subversion as
> a generall system with it's well defined concepts and terms. No matter
> what client they use.

I think your argument that changeset != revision, and that it is
totally misleading is overstating the case a little. The Subversion
book itself has this to say:

In Subversion, a global revision number N names a tree in the
repository: it's the way the repository looked after the Nth commit.
It's also the name of an implicit changeset: if you compare tree N
with tree N$B!](B1, you can derive the exact patch that was committed. For
this reason, it's easy to think of revision N as not just a tree, but
a changeset as well. If you use an issue tracker to manage bugs, you
can use the revision numbers to refer to particular patches that fix
bugs$B!=(Bfor example, "this issue was fixed by r9238."
http://svnbook.red-bean.com/en/1.5/svn.branchmerge.basicmerging.html#svn.branchmerge.changesets

IOW it is perfectly acceptable to use a revision number to refer to a
changeset. It is less clear exactly what 'range of revisions' means.
In the section on cherrypicking, which is mostly what we are talking
about here, they do use the term 'changesets'. I don't think it is
totally incorrect to use the term 'range of revisions' but nor is it
totally clear either. I will try to clarify this in the docs. Not sure
whether there is any need to change the wording in the dialog itself.

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-27 15:10:29 CEST

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