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

Re: Comments on merge wizard

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: 2007-10-22 20:38:47 CEST

Alexander Klenin wrote:
> I just tested a new merge wizard.
> Overall, it should indeed simplify merge process for the new users
> (hard to judge since I have no such users to test on).
> Leaving a question of wizard vs tabs aside for the moment, below are
> few observations:
> 1) IMHO we should either exclusively use Windows default buttons on
> the bottom pane, or not use them at all.
> Right now they are displayed inconsistently in mixed-locale environments
> (for example, English Tortoise on Russian Windows or vice-versa).

I know - I'll try to change the text of those buttons to match the
language of TSVN.

> 2) In the top right corner, I see Tortoise's butt ;-) Is it intended?

That's just the bitmap we already have in the About dialog. I haven't
had the time to create a separate bitmap yet :)

> 3) Am I connect in assumption that "To merge all revisions, leave the
> box empty."
> comment means that a separate "Merge all" command is no longer needed?
> This would be good thing.

Yes, if you leave it empty, that's the same as "Merge all".

> 4) While testing merge, command still says 'Dry Run' --
> I think this should be replaced by 'test only'.

I'll change that...

> 5) Why "Record merge" is a checkbox and not a button?
> Does it make sense in combination with any other button, like "Test merge"
> or (not-added-yet) "Diff"?

The "Record only" checkbox is a setting for the merge, so it's not
really a feature that requires a separate button.

The diff buttons have to go because what diff should we show for
multiple revision ranges? Only the merge command can work on those, not
the diff command.

> 6) I am not sure yet, but it seems that use case descriptions on the first page
> might be confusing to users with different workflows.
> For example, both descriptions do not reflect the typical usage in our company.
> However, at the moment I have no better idea.

I copied those descriptions from our manual. I needed something there
and I'm now waiting for better suggestions there :)


   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 Mon Oct 22 20:39:05 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.