> -----Original Message-----
> From: Ivko Stanilov [mailto:ivko_at_haemimontgames.com]
> Sent: Thursday, April 26, 2012 4:24 AM
> To: users_at_tortoisesvn.tigris.org
> Subject: BUG: Working copy broken after failed merge
>
> Hello,
>
> I'd like to report the following bug that happened to me. I'm using
> TortoiseSVN 1.7.6, Build 22632 - 64 Bit, 2012/03/08 18:29:39.
>
> I tried to merge changes from another branch. This went wrong when
> TortoiseSVN tried to merge changes to an EXE file in the working copy,
> which was currently running. I got a proper error message in the merge
> progress window that the merge failed for this file. It was followed
by
> a suspiciosly looking "merge completed" message. (messages cited may
> not be exact, I'm writing them from memory)
>
> After that, my working copy is broken and each operation on it tells
me
> to perform a Cleanup. Cleanup itself results in the following error:
>
> Cleanup failed to process the following paths:
> <working copy folder>
> Can't open the file 'C:\Users\<user name>\AppData\Local\Temp\svn-
> 73A1C3B9':
> The system cannot find the file specified.
>
> Please confirm this as a bug and direct me to the next steps I need to
> do to report it.
>
> ------------------------------------------------------
>
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessag
> eId=2953058
>
> To unsubscribe from this discussion, e-mail: [users-
> unsubscribe_at_tortoisesvn.tigris.org].
>
This sounds suspiciously like a problem we have seen with subversion for
some time (since at least 1.5.) We have been able to fix the working
copy by deleting the folder containing the file and then doing an
update. Of course you may have to revert the merge since all files in
that directory will be reset to the pre-merged state.
Wayne
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2953124
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2012-04-26 19:50:27 CEST