[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

RE: Re: BUG: Wrong merge range

From: Fisher, John <jfisher_at_forthrightsolutions.com>
Date: Thu, 25 Sep 2008 13:35:14 -0500

> -----Original Message-----
> From: phahn [mailto:pjtr.hahn_at_googlemail.com]
> Sent: Thursday, September 25, 2008 10:27 AM
> To: users_at_tortoisesvn.tigris.org
> Subject: Re: BUG: Wrong merge range
>
> On Sep 25, 3:49 pm, "Simon Large" <simon.tortoise..._at_googlemail.com>
> wrote:
> > The behaviour for 'merge a range of revisions is similar to the -c
> > behaviour of the CLI where -c27 is interpreted as equivalent to
> > -r26:27.
>
> Exactly. And this makes perfect sense because it is called a
> 'changeset' and it means 'diff and apply' the changes that got me from
> 26 to 27.
> This is consistent.
>
> This has nothing to do with printing. Counting pages is counting of
> entities.
> Revisions are no entities, they are points in time which represent a
> state.
> What we are interested in when we want to merge are not states but
> changes that occur between them and got us from A to B.
>

I think you're mental model is quite different than that of a large number of TSVN users.

When commiting a change, you get a new revision. So, that revision stores the differences between the new version of the file and the old version of the file. To describe "the change between A and B", you can get all of that information as a user by examining the revision number holding version B. So, the concept is that revision 234 holds the changes that the user made since revision 233. In many user's minds, revision 233 has absolutely nothing to do with the changes they committed to reach revision 234. (And I believe this is awfully close to the actual code model, as well.)

John

---------------------------------------------------------------------
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 20:35:50 CEST

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