Re: [TSVN] Merging from deleted branch to trunk

Will Dean wrote:
> At 17:24 19/01/2005 +0100, you wrote:
>
>> Oops! That one has been present since the first 1.1.0 release. Why
>> hasn't this bug been discovered much earlier?
>
>
> I think many of us are so confused by merging that when it does
> something unexpected, we assume it's us.
>
> I just tried a 'dry run' of a merge into 1.1.3 (which I had neglected to
> update first), and it gave me some conflicts. 'Fine' I thought - must
> remember to update first.
>
> Until I discovered that the conflicts had *actually* occurred in the WC
> - so the run wasn't as dry as I'd hoped...

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

> I think we need a big push merging after the 1.1.3 release:
>
> 1. Sort out the confusing interface
> 2. Make it clear from the progress dialog if you're 'dry running' or not
> (and give the checkbox a more useful name than 'dry run', which requires
> an immediate visit to the docs to work out what it means.

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.

> 3. Make double-clicking on dry-run progress dlg items do something
> sensible. (If it can't do a proper diff, we could at least avoid
> displaying mysterious error messages.)
>
> I'm sure some proportion of the problems I have with merges are down to
> my own finger trouble, but I'm also sure that some aren't.
>
> It's certainly not up to the high standard of the rest of the TSVN
> user-experience.

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.

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