[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

RE: Tortoise Bug: Rename command

From: Mark Irving <Mark.Irving_at_informatix.co.uk>
Date: Fri, 16 Oct 2009 04:45:42 -0700 (PDT)

Paul J. Smith wrote on 2009-09-14...

> Using the latest build of Tortoise (v1.6.5, Build 16974):
> What I did:
> I used Tortoise "rename" command to rename a directory on my local harddrive.

[Lots of things went wrong, including]

> When I tried to commit, I kept getting errors saying "tree-conflict," "use Clean-up tool," "folder cannot be locked," and "working copy is out of date; you must update before committing."

I just worked through a rather similar problem which one of my colleagues bumped into. We concluded that what happened was something like

(1) Edit a file, say d0\f.txt.
(2) Right-click that file and commit it. This produces a mixed-revision working copy, with d0 and most of its contents at revision 10, but d0\f.txt at revision 11.
(3) Use TortoiseSVN to rename d0 as d1.
(4) Right-click the whole working copy and commit.

This caused tree conflicts and confusion. To avoid any such problems, use TortoiseSVN Update (or svn update, the command-line equivalent) on the whole working copy immediately before any directory rename or move operation.

I suppose it might help if TortoiseSVN offered a warning for any directory-level move or rename of a mixed-revision working copy. I have no idea whether that is feasible, though, and it perhaps ought to be a Subversion feature rather than just TSVN.

  - Mark.


To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2009-10-16 13:45:44 CEST

This is an archived mail posted to the TortoiseSVN Users mailing list.