Simon Large wrote:
> Maybe we could have a merge wizard (I can feel the hatred rising
> already ;-) to guide you through the common use cases, and a 'classic'
> merge which is the dialog we have now.
>
I'm pretty sure that both you'll need to offer both options. The
manual dialog will be used for old server or for doing complicated
merges. The new style merge will hopefully become the new default....
because eventually it will handle the common merge use-cases with
minimal user input.
I suspect that even if this "auto-merge" doesn't make it into tsvn 1.5,
there will be demand for it pretty soon. Once people realise what the
command line client can do, they'll want the same in tsvn. I know
for me, I'll probably end up dropping to the command line client to get
this functionality.
> One thing to remember is that unless the server and all clients are
> 1.5, merge tracking will not work reliably, so we should not default
> to that mode.
>
Just trying to think through the options/requirements:
* Need the manual/detailed merge dialog for old servers and complex
merges
* Need the new "auto-merge" functionality
* The user needs the choice between merge modes.
* New "auto-merge" can be only made available to 1.5 servers
somehow. Or maybe it could just fail at the time they try to run
the auto-merge?
* Try to keep the merge dialog understandable ... it's getting
pretty complex.
* I think it would be preferable if it was all available in the same
merge dialog. Or a wizard ;)
Maybe there could be a way to select the type of merge at the top, and
this changes the top part of the dialog. e.g. when you do the
"auto-merge" you just get to choose the from URL (no To URL or
revisions, etc).
I'm wondering whether the new merge settings section could be hidden by
default, because most of the time people wouldn't change those. Maybe
you could have one of those vista-style "More Details" button that
expands to show more info/settings (I don't know how hard something like
that would be to implement though). :(
Sorry if this isn't helpful. I'm just trying to get some discussion
going to see if we can come up with something.
Do you know what Mark Phippard is doing with the Subclipse UI? Maybe he
has some good ideas on how something like this might work? Or maybe the
two communities could come up with something together? :)
Thanks again for the great tool.
Matt
Received on Wed Oct 17 14:29:52 2007