conflict merging deleted and re-added file

[mlippert]

I ran into a situation today that had me confused for a while. I almost submitted a bug until I realized the cause.

What happened is that a Get Latest Version... returned an error that the automatic merge had failed due to conflicts in a file that I didn't have checked out and hadn't changed.

What happened is that someone on my team had deleted the file and then added a new and different file back. So my working folder had version 1 of the old file, and the repository had version 3 of the new file.

What I'm wondering is if there is enough information in the _sgvault directory about my working folder copy of the file to know that it is actually a different file from the new file with the same name?

If so, then perhaps the error message could be improved to let me know that the file in my working folder has been deleted and replaced, or if the perform repository deletions locally flag allows, the old file can be deleted and the new one gotten.

I have the perform repository deletions locally flag set to remove working copy only if unmodified which in this case was true.

Mike