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

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

[Gnu-arch-users] Re: [BUG] microbranches: prism-merge vs multi-merge


From: Stefan Monnier
Subject: [Gnu-arch-users] Re: [BUG] microbranches: prism-merge vs multi-merge
Date: 27 May 2004 17:20:01 -0400
User-agent: Gnus/5.09 (Gnus v5.9.0) Emacs/21.3.50

> Another use for the idea of "forking microbranches to make new
> microbranches" is catching up after your upstream moves to a 
> new branch.

One way to do that would be to have a command like

    % tla commit --base address@hidden/toto--titi--3.4

which would do the same as

    % tla commit

except that the new revision would be a continuation of
address@hidden/toto--titi--3.4.

Then we could do

    % tla star-merge address@hidden/toto--titi--3.4
    % ...fix conflicts...
    % tla commit --base address@hidden/toto--titi--3.4

so the new revision is stored as a patch against the upstream branch rather
than a patch against the previous revision.


        Stefan




reply via email to

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