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

Mark as resolved during interactive merge.

From: David Henderson <dhenderson_at_smartFOCUS.com>
Date: Wed, 18 Mar 2009 12:55:32 -0000

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.

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


David Henderson


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

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.