Re: [Monotone-devel] how to merge trees

[Bruce Stephens]

Nathaniel Smith <address@hidden> writes:

[...]

> More precisely, we enforce the following lifecycle for files: 
>   -- files are born exactly once.  For every file, there is a unique
>      earliest revision which contains that file.  Call this birth
>      revision B.  Every revision which contains that file is a
>      descendent of B.
>   -- once files are dead, they stay dead.  If some revision R is a
>      descendent of B, and R does not contain the file, that file will
>      not be contained in any descendent of R.

My apologies, I misunderstood entirely.  These restrictions are for
any single path through the history, so obviously that would exclude
forks.  Doh!

[...]