RE: Chaos after renaming a folder

David Balažic asks

> Today I renamed (using the TSVN contect menu) a folder.
> When I tried to commit, it saif I should update first.
> If I try to update, I get a note about a tree conflict.

...

> What is wrong? How to resolve the situation? Should I try to
> revert?

Might you have had a mixed-revision working copy at the time of the rename? If so, it sounds similar to what I described a few months ago in

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

Prevention is much easier than cure: always do an update of your whole working copy just before any rename operation.

  - Mark.

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

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2010-02-05 16:06:27 CET