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

[TSVN] Re: Merge dialog, second attempt

From: Norbert Unterberg <nepo_at_gmx.net>
Date: 2005-01-26 18:37:45 CET

>>With all the talk about the (N-1) revision numbers ...

Now my two cent about the merge dialog and the N-1 talk.

I find the current way not intuitive, but the main reason for all this
confusion is that a revision number actually means two different things,
depending on the context: It is either the *revision* of the repository,
or the *changeset* that transformed the repository from one revision to
the next.

When you "merge from 122 to 123", you actually merge the differences
between r122 and r123 into your working copy. The term "revison range"
to describe differences is not a good choice. I even think there is no
such thing as a "revision range". Maybe there is a "changeset range"...

I believe that some of the confusion can be avoided if the terminology
tries to be clearer.

How about something like:

Specify the start and end revision between the merge takes place:
Specify the start and end revision of the merge:

From: (Start Revision and URL)

To: (End Revision and URL)

This way you emphasize the phrases "start revision" and "end revision",
maybe it gets clearer then.

One other suggestion:
Reorder the buttons at dialog bottom like this:

   [Merge] [Dry-Run] [Unified Diff] [Cancel] [Help]

This puts the button that performs the main action to a place where the
user finds it first (we are used to read from left to right, and merge
is the reason why I opened the dialog), and also visually separates the
three "do-it" buttons from the other two.


To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Wed Jan 26 18:39:58 2005

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