[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Monotone-devel] how to merge trees
From: |
Bruce Stephens |
Subject: |
Re: [Monotone-devel] how to merge trees |
Date: |
Tue, 16 Aug 2005 19:08:20 +0100 |
User-agent: |
Gnus/5.11 (Gnus v5.11) Emacs/22.0.50 (gnu/linux) |
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.
[...]
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, 2005/08/22