gnu-arch-users
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: [Gnu-arch-users] Potential flaw in patch-log pruning in proposal


From: Florian Weimer
Subject: Re: [Gnu-arch-users] Potential flaw in patch-log pruning in proposal
Date: Thu, 28 Oct 2004 21:49:04 +0200

* James Blackwell:

> First, assume trees A, B and C. B regularly merges from A, but in the
> process prunes the patch-logs.  C replays/updates/star-merges from B.
>
> Things still look reasonably sane, right?
>
> But now imagine what happens if C attempts to replay from A after
> replaying from B. C is going to end up in a pretty big mess, because
> without those patchlogs, C doesn't realize that the patches have already
> been applied, tries to apply the same patches twice, and then *boom*.

This is what I meant when I wrote that patch-log pruning requires a
global view.  Tom proposed an elaborate scheme involving a hierarchy
of branches with constrained merging.




reply via email to

[Prev in Thread] Current Thread [Next in Thread]