Reverting an ADD status file after an update tree conflict deletes the file

This came up as I tested another issue someone reported.

Perform the following steps...

1. Edit a file in a working copy

2. Delete that file in the repository (with the repo browser)

3. Update your working copy

4. Edit the tree conflict and specify "keep working copy"

5. The edited file now shows as an add

6. Revert the working copy

Observed:

The file with the add status is deleted.

Expected:

The "add" is removed and the file remains. Basically this is the behavior you get when you revert a file that you just added. I would expect reverting an added file to do the same thing whether the file was marked as add from an update or from just adding it.

BOb

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

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2013-10-11 16:09:56 CEST