Re: [TSVN] Merging from deleted branch to trunk

At 17:50 19/01/2005 +0100, you wrote:

>Are you sure the conflict occurred during the dry-run? My guess is that
>the conflicts happened when you updated...

Well, I hadn't updated at that point, but maybe they were already
conflicted by then.

>The progress dialog (now) shows a "(dry run)" when it does a dry-run. Not
>backported to 1.1.3 though.
>
>Why do you think that "dry-run" isn't clear enough? We could add a tooltip
>there to explain it, but I don't think we should change that. Subversion
>uses the same word, and it would confuse CL users if it was named differently.

I think that potentially confusing experienced CL users should be a
secondary consideration for TSVN, as I'm sure they're a very small
proportion of the user-base, and if they can cope with a CL merge, they're
unlikely to be confused by the TSVN merge.

I don't think that 'dry run' is idomatic Windows application parlance for
anything. Something like "[x] Preview changes (does not modify files)"
would seem to be clear to me. Most people know what 'preview' means, from
things like 'print preview' which has been around forever.

>Well, merging isn't easy, no matter how the GUI is made. And if you don't
>know what you're doing, you will get conflicts/unexpected results.

I agree that it's hard to write software which is easy to use, and that
there are probably merging concepts which *are* difficult to communicate.

However, I don't think TSVN is very good in this area at all. TSVN is
generally so much more than a dialog-box interface to the command line, and
I think it can be that here.

Tooltips and better helpfiles have their place, but they're an admission of
defeat in many ways.

Will

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Wed Jan 19 18:12:41 2005