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

TortoiseProc.exe crashes with binary file conflict

From: Daniel Becroft <djcbecroft_at_gmail.com>
Date: Tue, 3 May 2011 09:41:26 +1000


Using: TortoiseSVN 1.6.99, Build 21187 - 32 Bit -dev, 2011/04/19 21:21:25

After running an update, I got a conflict on a binary file. However, most of
the usual methods to resolve this conflict resulted in TortoiseProc.exe
showing the "TortoiseProc.exe has encountered a problem and needs to close."

The attempts I tried were:
- Right-click on the conflicted file in the Update dialog, and "Resolve
using mine"/"Resolve using theirs" -> crash. This resulting in the dialog
three (3) times (not sure why).

[in the working copy]
- Right-click on the conflicted file and select "Edit conflicts" -> crash.
- Right-click on the conflicted file and select "Resolved ..." -> crash
(after the choose items dialog appears)
- Right-click on the conflicted file and select "Revert" -> crash (again,
after the choose items dialog appears).

Attempting to open the "Check for Modifications" window also crashes.

If I manually delete the two conflict marker files (binary.file.rX and
binary.file.rY), then everything appears to be back to normal - I can
correctly revert the file.


Daniel Becroft
To unsubscribe from this discussion, e-mail: [dev-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2011-05-03 07:37:23 CEST

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