TSVN 1.7.1 lockup during merge operation

I was doing a large merge operation on my whole working copy (merge all trunk changes to a feature branch that was ~2000 revisions behind).

After logging a large number of updates (possibly all of the required updates; it's not clear at this point), TSVN seemed to get "stuck". It still shows the animated progress colours on the taskbar, and the busy mouse cursor, and has a disabled OK button, but nothing else has changed for over two hours.

Pointing Process Monitor at it reveals no activity, so it's not hitting the disk any more. Pointing Process Explorer at it shows that one thread is at 12.5% CPU (ie. 100% of a core). The callstack keeps changing (so it is doing *something*) but it seems stuck around the same point. An example trace is below:

TortoiseProc.exe+0x71306
libsvn_tsvn.dll!svn_ra_svn__input_waiting+0x5b2
libsvn_tsvn.dll!svn_ra_svn_read_tuple+0x40
libsvn_tsvn.dll!svn_ra_svn_drive_editor2+0x288
libsvn_tsvn.dll!svn_ra_svn__auth_response+0x2ad
libsvn_tsvn.dll!svn_client_log5+0x63ea
libsvn_tsvn.dll!svn_client_log5+0xaf0d
libsvn_tsvn.dll!svn_client_log5+0xb6d1
libsvn_tsvn.dll!svn_client_merge_reintegrate+0x4e1
libsvn_tsvn.dll!svn_client_merge_reintegrate+0x582
libsvn_tsvn.dll!svn_wc__call_with_write_lock+0x62
libsvn_tsvn.dll!svn_client_merge_peg4+0x18c
TortoiseProc.exe+0x6e71b
TortoiseProc.exe+0x199f62
TortoiseProc.exe+0x193a82
mfc100u.dll+0x254fe1
MSVCR100.dll!endthreadex+0x43
MSVCR100.dll!endthreadex+0xdf
kernel32.dll!BaseThreadInitThunk+0xd
ntdll.dll!RtlUserThreadStart+0x21

I'm going to kill the process now and see what state it leaves the working copy in and how much I can salvage. (So this is a bug report, not a support request.)

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2877132

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2011-11-11 03:46:07 CET