[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Monotone-devel] Re: Question for the FAQ
From: |
Florian Weimer |
Subject: |
Re: [Monotone-devel] Re: Question for the FAQ |
Date: |
Fri, 08 Apr 2005 23:45:39 +0200 |
* Nathaniel Smith:
> On Thu, Apr 07, 2005 at 10:41:46PM +0200, Florian Weimer wrote:
>> Its name. 8-)
>>
>> Suppose you have a directory called FOO, rename it in one branch to
>> BAR (with monotone, this means to move all files in it to BAR), and
>> keep another branch which still has the FOO directory. Now you add a
>> file called FOO/baz to the second branch. If you merge it into the
>> first, it shows up as FOO/baz, not BAR/baz, which makes more sense in
>> many cases.
>>
>> So the answer is no, monotone does not support directory versioning.
>
> If that's what you mean by versioning directories, then your
> conclusion is incorrect.
Oh. I had played around a bit, and apparently I misinterpreted my
test results ("monotone rename" on a directory was simply a noop at
one point).
> Current limitations:
> - directory deletion is broken and needs fixing
> - we have poor UI for resolving conflicts discovered during this
> part of the merge (though this isn't particular to directories,
> merging <add foo> with <rename bar foo> has the same problem).
> - there is no "add directory" operation; we probably need to add one
> for some subtle reasons:
> https://savannah.nongnu.org/bugs/?func=detailitem&item_id=12070
> but this requires a small architectural change, not just a bug
> fix.
Adding a new file to a directory which has been renamed doesn't work,
either.