RE: Chaos after renaming a folder

> I use TSVN 1.6.7* in XP to check out from a local repository.
> I have only one WC.
>
> 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.
> Then I tried Commit again, again with arror, but after that
> Update goes thru without errors (updasting the entire WC by
> right clicking the top folder)
>
> On commit I get:
>
> Commit failed (details follow):
> Aborting commit: 'F:\svn_checkout\XZY\foo\old folder name'
> remains in conflict
>
> "old folder name" is the name of the folder before I renamed it.
>
> What is wrong? How to resolve the situation? Should I try to
> revert?

I would suggest you revert the change. Then do an update. Then make the change, then commit.

BOb

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

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2010-02-05 15:58:21 CET