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

RE: Re: TortoiseMerge goes mad

From: Scott Pritchett <scott.pritchett_at_amtrak.co.uk>
Date: 2006-03-13 15:45:17 CET

Wow!

It hits 99% immediately here too. No prompts/windows.

Scott

-----Original Message-----
From: Simon Large [mailto:simon@skirridsystems.co.uk]
Sent: 13 March 2006 14:28
To: users@tortoisesvn.tigris.org
Subject: Re: TortoiseMerge goes mad

Scott Pritchett wrote:
> Hi,
>
> Just tried 'diffing' my lastest code and TortoiseMerge hits 99% CPU and sits there.
>
> Tried WinMerge on my file and the one in .svn to produce the attached patch file. Any clues ?
>
> I have the very latest TSVN from last night, and have rebooted.

This may be the same problem I am seeing. Try starting TMerge from the
start menu, so that it prompts for the filenames. In my case it still
hangs at 100% CPU without ever showing a window. Can you check if it
does that in your case.

Simon

-- 
        ___
   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.tigris.org
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: users-help@tortoisesvn.tigris.org
---------------------------------------------------------------------------------------------
This email and any files transmitted with it are confidential and
intended solely for the use of the individual or entity to whom
they are addressed.
If you have received this email in error please notify the
originator of the message. This footer also confirms that this
email message has been scanned for the presence of computer viruses.
Any views expressed in this message are those of the individual
sender, except where the sender specifies and with authority,
states them to be the views of Amtrak Express Parcels Limited.
Scanning of this message and addition of this footer is performed
by SurfControl E-mail Filter software in conjunction with 
virus detection software.
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: users-help@tortoisesvn.tigris.org
Received on Mon Mar 13 15:50:12 2006

This is an archived mail posted to the TortoiseSVN Users mailing list.