Re: [Monotone-devel] how to merge trees

[Bruce Stephens]

Nathaniel Smith <address@hidden> writes:

[...]

> Ohh, I see.  I thought when you talked about "a subsequent merge", you
> meant of the branch where the file died and the branch where the file
> didn't die.  So to be clear:
>
>    A
>   / \
>  B   C
>     / \
>    D   E
>
> If the file was removed in B, then:
>   the merge of D and E can contain the file
>   the merge of D and B cannot contain the file

Yes, I understand, my first thought was correct.  But as you say, it's
not as bad as it might seem.  It's a bit annoying, but it's not likely
to be a big problem in practice.  Anyway, a system where I can
actually trust renames to work properly would be worth some minor
restrictions.

[...]