Mark as resolved during interactive merge.

If you are doing an interactive merge:
- come across a conflicted file
- click "Edit Conflict"
- Edit the conflict
- Click the "mark as resolved" button within tortoise merge.

You will receive the error message in the resolve dialog:

Command: Resolve
Error: 'C:\Test\test-shared\New Folder 2\.svn\tmp' is not a working copy

Error: Can't open file 'C:\Test\test-shared\New Folder
2\.svn\tmp\.svn\entries': The
Error: system cannot find the path specified.
Finished!:

If you go back to TortoiseMerge, save the file, exit, then click on the
resolved button and the file gets resolved properly.

Using version:

TortoiseSVN 1.5.99, Build 15039 - 32 Bit -dev, 2009/01/07 19:53:20
Subversion 1.6.0, -dev
apr 1.3.3
apr-utils 1.3.4
neon 0.28.3
OpenSSL 0.9.8i 15 Sep 2008
zlib 1.2.3

Thanks,

David Henderson

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

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2009-03-18 13:56:42 CET