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

RE: Re: Merge dialog

From: Geoff Rowell <Geoff.Rowell_at_varolii.com>
Date: 2007-10-18 22:32:53 CEST

On Thursday, October 18, 2007 3:17 PM Kari Grano wrote:
> 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.
From a real estate point of view it may not be possible, but I'd like to see the working copy, URLs and revisions selected on subsequent pages. Otherwise, when distracted, you'd have to be using that "Back" button to recover your train of thought.


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

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.