[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: Erik Hemdal <erik_at_comprehensivepower.com>
Date: Thu, 25 Sep 2008 12:13:21 -0400

> -----Original Message-----
> From: phahn [mailto:pjtr.hahn_at_googlemail.com]
. . . .
> A better analogy to this would be paying electrical power.
> When I would ask you what you paid from 2000-2008 you
> wouldn't give me your meter readings from 1999-2008, would you?

No, but if you wanted to know the total power consumed from 2000-2008, I
would subtract the last 1999 reading from the last 2008 one.

. . . .

> Sorry, but I can't see what is more natural here.

When I complete a merge, I note this in the change log, so it's clear where
two branches are synchronized. The current behavior allows me to find each
of those "merge revisions" and, next time, just pick the revisions where I
have new changes. I find where I last merged, and begin future merging at
the next higher revision I see. It's very easy.

I can understand the point that one might want to start from the
"last-merged point", and the SVN CLI client does that. However, I find it
easier to think of it in terms of the revisions that I haven't merged yet.
From a couple of years of working with developers who are simply TSVN users,
this is easier to explain and train. Users can see the last merge point in
the log, and pick up from the next-higher revision they see in the log.

I certainly could get used to the behavior you are asking about, but at this
point I would not want to. The difference was confusing at first, but I
figured it out.

> Another simple expample:
> Give me all changes from the creation of the repository until
> now! In SVN world this is -r0:HEAD, what would that be in TSVN?

I just select the log entries for the revisions I want, and ask for the

> I'm really sorry if I'm to ignorant, but I think people
> (users) that are familiar enought to be able to use svn
> should be able to understand the "off-by-one error problem".

It's a valid question (no wonder it comes up again and again). You could
argue the point either way, but in the end TSVN has to pick one way. I hope
that by explaining how I think about it, it might help.


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 18:13:39 CEST

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