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

RE: How to Rename directories

From: Gavin Lambert <colnet_at_mirality.co.nz>
Date: Tue, 10 Feb 2015 22:47:57 -0800 (PST)

On 11/02/2015 14:13, Dave O'Connor quoth:
> Right now we are developing a new version of our Command Ops game and I am trying to rename directories. On my working copy I have selected the directory, right clicked and selected the SVN Rename menu item. It renames the directory just fine. When I go to commit though I get this Error message:
>
> Commit failed (details follow):
> Cannot commit 'E:\Panther Dev\CmdOps 2\Win32\Scenarios\Foothills of the Gods
> Scenarios' because it was moved from 'E:\Panther Dev\CmdOps
> 2\Win32\Scenarios\Greek Scenarios' which is not part of the commit; both sides
> of the move must be committed together.
>
> The trouble is the original directory "Greek Scenarios" has ben renamed, so how can I commit it?
>
> Now I have done a bit of reading of similar threads in this forum and I can sort of understand the rational, but what I would appreciate is some simple advice on the steps I need to take to fix this and also to avoid it in the future. What exactly should I have done to rename this directory?
>
> I'm stuck right now and need to get a game out the door. Would appreciate a quick reply. Many thanks.

You did the rename itself correctly.

But as the error message says, you need to commit the common parent directory of the move operation. In this case, since it was just a rename, both the old and new directories have the same parent.

So in your case, commit E:\Panther Dev\CmdOps 2\Win32\Scenarios, not the renamed directory itself.

Usually the best thing to do though is to get into the habit of doing commits (and merges) only at the root of the working copy, never in any subdirectory. There's rarely any good reason to do it any deeper than this, and it can get you out of a lot of trouble.

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

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2015-02-11 07:48:05 CET

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.