[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Monotone-devel] how to merge trees
From: |
Nathaniel Smith |
Subject: |
Re: [Monotone-devel] how to merge trees |
Date: |
Mon, 22 Aug 2005 01:04:31 -0700 |
User-agent: |
Mutt/1.5.9i |
On Tue, Aug 16, 2005 at 03:38:30AM -0700, Nathaniel Smith wrote:
> Either way, after we've merged all scalars using the above rules, we
> need to do one more thing -- scan for what I've been calling
> structural conflicts. It's possible that after we've done the local
> scalar merging, we may still have global inconsistencies in our tree
> structure. Such problems include:
> -- multiple items with the same name, in the same directory
> -- circular directory structures
Forgot one: files/directories with non-existent parents
(Possible because delete_dir is no longer recursive...)
-- Nathaniel
--
Eternity is very long, especially towards the end.
-- Woody Allen
Re: [Monotone-devel] how to merge trees, Bruce Stephens, 2005/08/16
Re: [Monotone-devel] how to merge trees, Florian Weimer, 2005/08/16
Re: [Monotone-devel] how to merge trees,
Nathaniel Smith <=