Merge dialog

Hi,

As you all know, our merge dialog is a little bit crowded and doesn't
make merging easy. And now with merge tracking available, there are even
more options we have to add.

Currently (latest nightly build) we have two(!) merge commands available
from the explorer context menu:
* one brings up the well known merge dialog
* the other tries to guess the source url for the merge and then merges
everything that hasn't already been merged. This is useful if you're
working on a branch and want to bring the branch up to date with trunk.
But it is very bad when executed on trunk.

So, how can we improve that situation?

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?

There are two very different merging situations:

1) merge a revision range: one source url, start and end revision (maybe
a peg revision)
2) merge the difference between two urls: two source urls with each
having a revision

For merging a revision range, with merge tracking we can find out the
source url - but that can take minutes if the server doesn't know merge
tracking yet.

Please post your ideas here, anything is allowed - I'm desperate because
I really don't like the way it looks right now...

Stefan

-- 
        ___
   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.net
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org