Re: TMerge hangs on broken WC

Stefan Küng wrote:
> Simon Large wrote:
>
>> I just sent this recipe to the SVN list (reported on our users list)
>> because it breaks the WC. However, TMerge hangs when you try to diff
>> the file after the merge. Maybe worth adding another check to TMerge
>> to prevent that, even though the WC is now useless.
>
> Thanks for the recipe.
> Problem is, I can't get TMerge to hang when diffing the file against
> BASE. I tried both the 1.3.2 and HEAD version of TMerge.
> What are your settings in TMerge? Maybe that's something to do with it?

Sorry, the WC was a red herring. It doesn't work at all if I start it
with no parameters. Registry settings in attached png.

TSVN r5794.

Simon

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