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

Re: [TSVN] Re: Merge dialog, second attempt

From: Will Dean <svn_at_indcomp.co.uk>
Date: 2005-01-25 15:29:17 CET

At 09:11 25/01/2005 -0500, you wrote:

>On the N-1 issue, how long are people really going to be confused about
>this? I mean, certainly you are not still confused about it. Sure the
>first couple times you might be a bit confused, but then hopefully most
>people will get it. There is nothing illogical about what Subversion is
>doing, it is just a generally confusing operation no matter what you do.

In which case, we need a better explanation in the helpfile of why this is
so. It currently (at least the version I have here) says:

    * In the From Revision field enter the initial revision number. This is
the revision before the changes you want to merge. Revision numbers are
auto-incremented after each commit. You want to start merging the changes
before the revision number is auto-incremented. For example, if your log
messages look something like this:
    If you now want to merge the changes from MyBranch into the trunk you
have to choose 36 as the From Revision. Not 37 as you might think.
This is excellent at trying to bang home that you have to do the -1, but I
don't think it explains why very well. I maintain strongly that when
presented as a mysterious 'you have to do the -1 bit', it makes no sense.

Just because page numbers conventionally appear at the bottom of a page,
doesn't mean that if I want to print pages 3-4 in a Word processor I have
to ask for '2-4'. Quite frankly, people would laugh at this.

I daresay there is a reasonable explanation in the SVN design history of
why this is so (can anybody point me at this?), and I'm aware we can't
change it now anyway. But I don't think that saying there's 'nothing
illogical' about it is completely fair.


To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Tue Jan 25 15:30:16 2005

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