Re: Merge dialog

On 2007-10-18, Stefan Küng wrote:
> I thought of maybe implementing a wizard style dialog which guides the
> user through the necessary steps. But I hit a wall here: what shall we
> ask the user on the first page?

Having a wizard sounds like a good idea to reduce the complexity of the UI.
How about:

- page 1 would be used to select the merge style

A. merge all changes from branch origin
(this is the 'automerge', or 'svn merge -g' option)

B. merge a set of revisions from another branch
(this would be the old merge dialog with 'Use From URL' checked in To:
field.
Maybe this could be enhanced so that the revision set need not be contiguous
- is it supported in 1.5?)

C. merge the difference between two URLs
(this would be the old merge dialog with 'Use From URL' unchecked in To:
field)

- page 2 would only be shown for selection B. On that page, the user would
enter branch URL and select a set of revisions.

- page 3 would only be shown for selection C. On that page, the user would
enter two URLs and two revisions

- page 4 would be used to select merge options. On that page there would
also be buttons for
'dry run', 'diff' and 'unified diff' along with 'Finish', which would be
same as 'merge'.

The problem is where to display the working copy target of the merge. Could
it be shown on page 1?

So there would be either a 2 or 3 page wizard, depending on page 1 choice.

Kari

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Thu Oct 18 21:54:54 2007