Unexpected tree conflict after merge

Hello,

I'm getting tree conflicts following a merge but don't see why they should
be occurring. Is there something I'm missing? Here are my steps:

1) Create branch1/ containing file.txt
2) Create branch2/ based on branch1/ - branch2/ now contains file.txt
3) Remove file.txt from branch1/ and commit
4) Merge from branch1/ to branch2/ and commit - file.txt is deleted from
branch2/
5) Merge from branch2/ to branch1/ - causes a tree conflict on file.txt

I would think the merge in step 4) would communicate to the server that the
deletion of branch2/file.txt was due to a merge from branch1/, so a merge in
the opposite direction (branch2/->branch1/) should not trigger a tree
conflict. Is this possible?

FYI - I'm using TortoiseSVN to do these operations. When I select "Edit
Tree Conflicts" in TortoiseSVN it says "The last merge operation tried to
delete/move/rename the file 'file.txt', but it was deleted, moved or renamed
locally."

Thanks,
Shaun

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=2415991

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-11-10 03:30:29 CET