On Wed, May 4, 2011 at 3:39 AM, Stefan Küng <tortoisesvn_at_gmail.com> wrote:
> On 03.05.2011 01:41, Daniel Becroft wrote:
> > Hi,
> >
> > 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." dialog.
> >
> > 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.
>
> This is a bug in the svn library. Just reported it a few minutes ago and
> Hyrum seems to have just fixed it. I'll update to the latest svn trunk
> soon.
>
> Stefan
>
Thanks, Stefan. I'm not sure if it's related to the same problem, but
TortoiseMerge reports the following error when selecting "Edit conflict":
---------------------------
TortoiseMerge
---------------------------
The diffing engine aborted because of an error:
Can't open file 'svn-9A19D28E': The system cannot find the file specified.
---------------------------
OK
---------------------------
If I select "Resolve later", and then choose "Edit conflict" on the
individual file, it works correctly.
Cheers,
Daniel B.
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=757&dsMessageId=2729640
To unsubscribe from this discussion, e-mail: [dev-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2011-05-04 05:53:39 CEST