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

[Nathaniel Smith]

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.