RFC: stacks - patch management extension inspired by bzr-loom
Peter Arrenbrecht
peter.arrenbrecht at gmail.com
Sat Sep 6 03:30:55 CDT 2008
On Fri, Sep 5, 2008 at 11:47 AM, Peter Arrenbrecht
<peter.arrenbrecht at gmail.com> wrote:
> On Sun, Aug 31, 2008 at 11:09 PM, Emanuele Aina <em at nerd.ocracy.org> wrote:
>> Maybe you have already seen it, but in git-land has recently appeared a
>> project with a similar aim than yours, TopGit
>> http://kerneltrap.org/mailarchive/git/2008/8/3/2795494
>
> This is exactly it. And has some good ideas, too. Shall let myself be
> inspired. Thanks!
So I've been. I have renamed stacks to pbranch to reflect the fact
that we can manage non-linear patch dependencies with this approach.
And I have switched from auto-merging on `hg sgo` to the topgit-style
explicit patch merging using `hg pmerge` with a warning issued by `hg
update` of needed merges.
New repo:
http://www.bitbucket.org/parren/hg-pbranch/
and new docs:
http://arrenbrecht.ch/mercurial/pbranch/
More to come, especially
* manipulating dependencies
* multiple parent merging
* distributing changes; outdated example here:
http://arrenbrecht.ch/mercurial/pbranch/dist.htm
-parren
More information about the Mercurial
mailing list