[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: Wed, 1 Oct 2008 07:13:57 -0700 (PDT)

On 27 Sep., 15:10, "Simon Large" <simon.tortoise..._at_googlemail.com>
wrote:
> 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.

It says:
1) The way the repository looked AFTER the revision. I.e. if I
interpret the N as changeset or revision to specify a range N to M
makes a difference.

2) A revision is the name of an I M P L I C I T changeset. That is
still not the same as revision == changeset

3) The changeset is N-1 compared to N and not N itself (at least as
long as we call N a revision). The difference is that asking for the
changes that happened between revision N to M does by definition not
include N-1. If we ask for all the changes between CHANGESETs CN to CM
this would include all changes that happened between N-1 and M.

First: I know nobody specifieing ranges of changes in terms of
changesets. This seam to be something special to TSVN users.
Second: If one would do so he should name it a range of changesets and
not a range of revisions. Thats all.

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

Who said that we are talking about cherrypicking? My primary concern
is keeping a branch in sync with the trunk.
If I write to the log that trunk revisions x:y are already merged than
I expect that my collegues merge y:z next time and don't want them to
merge y-1:z.

I did said Changset is not a valid term and I also never said you
can't concatenate a number of changesets to a list of continous
changes.
My whole point is about that all docs and howtos about subversion +
the reference client refer to a revisions range N:M as the changes
between N and M and not the changesets N to M because in that
terminology changeset is a shortcut to the difference between N-1:N
and thus the changesets N to M would be the changes between N-1 to M
and this is obiously not equivalent because the Terms changeset and
revision are not equivalent.

As you set the relationship between both terms is an implicit one.
Thus if the dialog would ask for a list of changesets it would be easy
to convert to from a revisions range by adding +1. Currently it is
asking for revisions but the meaning is changeset.

> Not sure
> whether there is any need to change the wording in the dialog itself.

There is strong need to do so!

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_tortoisesvn.tigris.org
For additional commands, e-mail: users-help_at_tortoisesvn.tigris.org
Received on 2008-10-01 16:14:08 CEST

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