Re: How to hierarchically merge from the root to the leaf of a branch tree? (Patch stack management)

From: Jakub Narebski <jnareb@gmail.com>
Date: Aug 1, 2013, 07:28 UTC
Message-ID: <loom.20130801T092209-291@post.gmane.org>
In-Reply-To: <ktc2sl$d4f$1@ger.gmane.org>

Jens Müller <blog <at> tessarakt.de> writes:

Show 8 quoted lines

> 
> Hi all!
> 
> I mainly use Git for version control, but have also tried out Mercurial.
> While I don't really like Mercurial in general, the idea of maintaining
> clearly separated patches with Mercurial Queues (MQ) is quite appealing.
> Therefore, I am looking for something similar (but easier to use, more
> "gitty" and maybe even more powerful) in Git.

On Git Homepage and on Git Wiki you can find a (partial) list of Git tools. Among those there are patch-management interface tools, such as Guilt (formerly Git Queues (GQ), inspired by Mercurial Queues (MQ)) and StGit.

There is also TopGit, which is feature-branch management tools (which seems like what you want, from what you written below).

Unfortunately I don't know which of those projects are actively maintained...

Show 16 quoted lines

> So I will first explain what I have in mind:
> 
> As an example, let's say I am doing test-driven development. My master
> branch follows the main repository of the software. Branched out from
> that, I have a branch called "feature-test", and branched out from that,
> "feature-implementation":
> 
>     master
>     |_ feature-test
>        |_ feature-implementation
> 
> For each branch, I remember the parent branch.
> 
> Implementation would then work like this: I checkout feature-test and
> write some test. Then I checkout feature-implementation, rebase it to
> the current status of feature-test and write the implemenation. And so on.

[...]