[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: [Monotone-devel] Re: How do I merge 2 unrelated branches into 1 ?

From: Dmitry Kakurin
Subject: Re: [Monotone-devel] Re: How do I merge 2 unrelated branches into 1 ?
Date: Sat, 7 Oct 2006 15:16:29 -0700

If you were to say that 'mtn does not support dirs' then the whole
problem of renaming dirs becomes non-existent: "What dirs ?" :-)
Don't get me wrong, as a user, I love to have this feature (of
renaming dirs). I'm just wondering how high is the price for such a
feature in terms of code complexity. And how many other features (like
merging thru local dir) have to wait because of this.
Obviously it's up to you (devs) to decide.

- Dmitry

On 10/6/06, Nathaniel Smith <address@hidden> wrote:
On Fri, Oct 06, 2006 at 08:51:04AM -0700, Dmitry Kakurin wrote:
> I also wonder why keeping track of dirs is necessary. Perforce (for
> example) gets away with only keeping track of files and creates dirs
> on demand.

The most visible reason is, because it allows us to support directory
renaming, with full merge support.

If I do:
 $ mtn rename foo/ bar/
and you, simultaneously, do:
 $ mtn add foo/your-new-file
then we merge the two changes, the merger will know to put
your-new-file into bar/, not foo/.

-- Nathaniel

Electrons find their paths in subtle ways.

Monotone-devel mailing list

reply via email to

[Prev in Thread] Current Thread [Next in Thread]