Re: [TSVN] Merging from deleted branch to trunk

Will Dean wrote:
> 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.

We already have now one user _not_ using TSVN anymore because of your
report...

>> 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 so. Sure, many people don't use the CL client. But also
many people do! And even more people read the subversion book about
merging (we recommend that in our own docs!). And in that book the
"dry-run" is mentioned.

> 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.

For me, "preview" means that I can see the _result_ before actually
doing something (like print). But with a dry-run, you can't see what the
result would be, you can only see which files _might_ get changed, not
how they get changed.

So if you're not comfortable with a tooltip, we could extend the label to
dry run (does not modify files)
instead. But I want to keep the term "dry run".

Stefan

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