[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
RE: [Gnu-arch-users] Re: Mixing star-merge and selective replay
From: |
Parker, Ron |
Subject: |
RE: [Gnu-arch-users] Re: Mixing star-merge and selective replay |
Date: |
Fri, 16 Apr 2004 10:40:02 -0500 |
> From: Parker, Ron [mailto:address@hidden
> Using this, I believe that mainline, fork and spoon could all
> star-merge from fork and spoon with out ever picking up the
> *-local only patches. Also fork and spoon could update from
> mainline and the *-locals from their parent utensil.
I forgot to mention that if the person using fork-local needed to revert a
patch that was merged from spoon into fork, they could "aba revert" it in
fork-local and just consider that one of the "never-merge-this-elsewhere
patches" when apply-delta'ing back into fork.