Tree conflict dialog fails to resolve conflict correctly in merge with added files

Using: TortoiseSVN 1.6.9

Steps to reproduce:

1. Create empty SVN repository with standard trunk and branches
directories (empty trunk). Create a branch of the trunk.

2. Create a new file with the same name in both trunk and branch.
Commit both.

3. In the working copy of the branch, use TortoiseSVN to merge the
trunk to the branch. A tree conflict results.

4. In the Merge results dialog, right-click the tree conflict and
choose Edit Conflicts. The dialog reads "The last merge operation tried to
add the file 'foo.txt', but it was already added locally."

5. Click "Keep the file from the repository."

Expected: The version from trunk is saved to the working copy.

Actual: The version from the working copy is retained.

Am I misunderstanding the dialog?

When I click "Keep the local file", the version from working copy is also
retained. In other words, regardless of which of the two options I choose in
the dialog, the same outcome (working copy retained) occurs.

In a related matter, in the Merge results dialog, when I right-click the
tree conflict and choose "Resolve conflict using theirs", the message "Tree
conflicts can only be resolved to 'working' state" appears. I would expect
that the "Resolve conflict using theirs" option would perform the same work
as the "Keep the file from the repository" button in the Edit conflicts
dialog.

Stephen

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

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2010-07-05 22:51:22 CEST