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

[TSVN] Re: r2548 - selection of merge range

From: Simon Large <slarge_at_blazepoint.co.uk>
Date: 2005-01-26 22:27:07 CET

Jens Scheidtmann wrote:
> Mark Phippard <MarkP@softlanding.com> writes:
>> I would just hate to see us clutter up the UI for a somewhat edge
>> case.
>
> If you're used to the cmd line client, you now that you have to do a
> merge, if you want to back out something, you don't do svn st.

Well you're both right. There is a better way to back out the changes
via show log, but it only works when 1 revision is selected. To back out
multiple revisions, the only option is to use merge with the order of
revisions reversed.

I like the idea of being able to select revisions in this way, but (did
I mention this before - too many times) inconsistency could cause us
problems. For the WC show log always, and for the other two in
'different URL' mode, this button sets the 1 rev you select. And in
'same URL' mode, the 'show log' button has a different behaviour.

IMHO the behaviour should revert to being consistent. If we want this
method of setting a range, and I do think it's a good method, then it
needs a separate button with a different title. You could put it in the
'To:' groupbox after the 'Use same URL' checkbox. These show log dialogs
would all benefit from a small comment area telling you what you should
select (1 revision or a range), and what will be changed in the merge
dialog when you do that. And maybe a reminder of which button you
pressed to get it, because they all look identical.

It does add one more thing to the UI, but the people who hate the (N-1)
will be happy, and the people who always thought (N-1) was right will be
happy.
Or is that just another step towards the GUI Hall of Shame?

Comments please ...

/me waiting for rocket attack from Stefan

Simon

-- 
       ___
  oo  // \\      "De Chelonian Mobile"
 (_,\/ \_/ \     TortoiseSVN
   \ \_/_\_/>    The coolest Interface to (Sub)Version Control
   /_/   \_\     http://tortoisesvn.tigris.org
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Wed Jan 26 22:35:33 2005

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.