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

Re: TortoiseMerge not working in nightly

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: 2006-03-06 17:33:32 CET

Roel Harbers wrote:
> TortoiseMerge doesn't show up when I do a "Diff" from the explorer
> context menu or a "Compare with base" from the commit or check for
> modifications dialog. The TortoiseMerge process does start, takes 100%
> cpu, and won't terminate. If I try again, more TortoiseMerge processes
> start, all taking as much CPU as they can get.

Can't reproduce that.
Does it happen with every file you diff? Or just some files?
What are the settings you have in TMerge? (lineendings, whitespaces, ...)

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 Mon Mar 6 17:41:00 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.