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

Re: More feedback on merge wizard

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: 2007-11-06 18:27:39 CET

Simon Large wrote:
> On 06/11/2007, Alexander Klenin <klenin@gmail.com> wrote:
>> Sorry for a delay -- I was overloaded at work.
>> Now that I have actually installed recent nightly at work and tried to use it
>> for several days, I have more comments.
>> Good news: it is actually tolerable to work with, just slightly worse
>> then before
>> (for me, that is, I am sure novice users will find it much easier).
>> To improve it, I suggest:
>> 1) Put 'Merge' button at the bottom of the dialog, disable it on the
>> first page --
>> this will allow skipping the last page which contains rarely modified settings.
>> 2) Create a (hidden?) option to start merge wizard from the second page
>> (because 99% of time users would select first radio button on the first page).
>> This will reduce common case back to a single dialog, while retaining
>> interface simplifications.
>> Anyway, even if you reject my suggestions,
>> the current wizard is quite usable, just inconvenient.
> Well that's strange. Just last night I was about to suggest almost the
> same things, but with a small variation. Have a 'merge-meister' mode
> (this is a term subversion uses) which might be in the settings
> dialog, or a hidden registry setting. If that mode is selected then:
> 1. Go straight to the 2nd page, remembering the merge type from last
> time. If it is wrong, just use the [back] button to go back and change
> it.

Alexander already implemented that.

> 2. Enable the Merge button on the 2nd page, so you can skip the last
> page. But this should only happen in merge-meister mode, not for
> normal users, otherwise they will miss the last page.

Not sure if that's possible without rewriting the wizard control.
Also I don't quite get the fuzz about reducing clicks in the merge
wizard - three clicks aren't that much. And now with Alexanders hidden
registry setting, we're down to two clicks. What's one more to get to
the last page?

>> Bad news: these features do not (yet) work ;-)
>> My most common use case is to merge all revisions from topic branch into
>> either a review branch or trunk.
>> 1) When merging a range of revisions from branch to trunk, only
>> globally consecutive
>> revision numbers gets translated into ranges. Correct behavior would be
>> to make ranges from all revisions which are consecutive on the selected branch.
>> This is a serious regression, as it essentially forces me to enter
>> revision ranges by hand.
>> I could take a look at fixing this, but not very soon, I am afraid.

I'm not sure I understand you here. If you show the log dialog, select
all revisions from the branch you want to merge, then of course there
will be multiple revision ranges. But those get 'merged' by the svn
library automatically anyway (it determines its own revision ranges from
the one we pass to it, i.e. removes already merged revs, concats what it
can and then does the merges).
Why do you think you have to manually enter a revision range there?

>> 2) Although 'merge all revisions' does what it is intended to do,
>> it is not what users expect -- I already asked three developers at my company,
>> and not one of them intuited it correctly.
>> What I (and them) want it to do is to take all revision from
>> selected branch not yet merged into the branch of the working copy.
> I don't understand. These sound the same to me. What it is intended to
> do is to merge all revisions which have not yet been merged. Of course
> this will ONLY work correctly if you have the merge tracking
> information to say which revs have already been merged.

Yes, this only works if the server also understands merge tracking.
Otherwise it will merge everything (including already merged revisions,
sorry). That's also why it's in the extended menu, not in the default
one: it's not something an unexperienced user should use.


   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
Received on Tue Nov 6 18:28:17 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.