[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Monotone-devel] Re: mtn: misuse: rename target 'Foo/bla' already exists
From: |
Boris |
Subject: |
[Monotone-devel] Re: mtn: misuse: rename target 'Foo/bla' already exists |
Date: |
Tue, 23 Sep 2008 14:11:22 +0200 |
User-agent: |
Opera Mail/9.52 (Win32) |
On Tue, 23 Sep 2008 13:18:01 +0200, Stephen Leake
<address@hidden> wrote:
Hi Stephen,
[...]You can check out the _other_ revision in a separate workspace to
compare them.
This is a case where "show conflicts" would help, _if_ it could show
workspace conflicts.
Before I mess up everything and lose revisions maybe someone can tell
me how I can proceed safely? I'm using monotone 0.40 (both on Windows
XP and Cygwin).
You have a conflict; revision '4e34de' has a file named Foo/bla, but
the workspace has an _unknown_ file Foo/bla as well.
I'd be surprised if it's unknown: Foo/bla is a directory which has been
added to the project a long time ago. On my Windows computer it's called
however Foo/Bla. Is it possible that this problem is related with case
sensitivity? We are using monotone on different operating systems. And I
suspect that Windows developers don't really care about case sensitivity.
The simplest way to proceed is to move the workspace file Foo/bla to
somewhere else, outside the workspace. Then do the update, then use
your favorite merge tool to merge the known Foo/bla with the unknown
Foo/bla.
Thanks, I did this. I compared then the directories with each other: All
files are identical (no new or dropped files either).
With 'mtn heads' I'm now told that the branch is merged. However when I
try 'mtn update' I get now this error message:
mtn: updating along branch 'mybranch'
mtn: selected update target 4e34dedb6e8a9cb16f3a303b86c61fd384328e42
mtn: [left] 5a641ac778ae8acab3f1415febc4582bc9204810
mtn: [right] 4e34dedb6e8a9cb16f3a303b86c61fd384328e42
mtn: error: workspace is locked
mtn: error: you must clean up and remove the _MTN/detached directory
When I check _MTN/detached I find two files called "2" and "3" which are
the header and .cpp file of a class which isn't used anymore. The header
and .cpp file doesn't exist in my workspace anymore. If I try to drop them
with 'mtn drop' monotone tells me "not currently tracked".
It seems like my workspace is up-to-date now. However there is still a
problem with _MTN/detached. If I simply remove _MTN/detached and try 'mtn
update' again I get the very same error message before I removed Foo/Bla
from my workspace. Looks like I'm in a vicious circle. ;)
Or it may be that one or both of the files should be renamed instead
merging them.
I've checked out now the right side - same problem:
mtn: expanded selector '4e34dedb6e8a9cb16f3a' -> 'i:4e34dedb6e8a9cb16f3a'
mtn: expanding selection '4e34dedb6e8a9cb16f3a'
mtn: expanded to '4e34dedb6e8a9cb16f3a303b86c61fd384328e42'
mtn: misuse: rename target 'Foo/bla' already exists
Once again I tried to check out the left side:
mtn: misuse: no match for selection '5a641ac778ae8acab3f1415fe'
I can't check out any side? With 'mtn log --last 1' I get:
o ---------------------------------------------------------------
| Revision: d8b16f06a83fdd3ea7a7c75e8297fa3df03b621f
| Ancestor: d84130232bff195fd077ddb8294fe13d4c103c58
...
That tells me that my workspace is not yet up-to-date as the revisions
'mtn update' tries to merge have different IDs.
[...]This is discussed in the monotone manual, in the section Advanced
Uses | Workspace Collisions, and the second option in Advanced Uses |
Merge Conflicts. Can you suggest improvements to those sections that
would have helped you with this?
I've been searching for "already exists" in the manual (as the error
message I get is "rename target 'Foo/bla' already exists"). I found one
match but not an explanation for the error message. I'll have a look at
the section but recommend to put the error message(s) somewhere there
(that would have helped me to find that part of the document :).
Boris