Spurious delete in 1.6.2

We are seeing the following behavior:
BranchA created from the trunk
BranchB created from the trunk.
BranchC created from the trunk
Changes on Branches A, B and C
FileX added to BranchA - REV
Changes on Branches A, B and C
REV reverted on BranchA – removes FileX
FileX added to BranchC
BranchA merged to the trunk
Trunk merged to BranchB
BranchB merged to BranchC
The last action queues up a delete for FileX. The action of merging BranchA to the trunk would not be expected to cause a delete on FileX on the trunk since it did not exist there. The developer found this because when he tried to commit the merge to BranchC, tortoise it complains of a recursive delete. Reverting fixed the problem.

Shouldn’t the actions on FileX be essentially a no-op when BranchA merges to the trunk?

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

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2009-07-15 18:26:29 CEST