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

Re: TMerge hangs on broken WC

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: 2006-03-10 18:00:41 CET

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?

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
Received on Fri Mar 10 18:01:03 2006

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.