From: Jakub Narebski <jnareb@gmail•com>
To: git@vger•kernel.org
Subject: Re: How to hierarchically merge from the root to the leaf of a branch tree? (Patch stack management)
Date: Thu, 1 Aug 2013 07:28:08 +0000 (UTC) [thread overview]
Message-ID: <loom.20130801T092209-291@post.gmane.org> (raw)
In-Reply-To: ktc2sl$d4f$1@ger.gmane.org
Jens Müller <blog <at> tessarakt.de> writes:
>
> 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...
> 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.
[...]
next prev parent reply other threads:[~2013-08-01 7:28 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-07-31 22:25 How to hierarchically merge from the root to the leaf of a branch tree? (Patch stack management) Jens Müller
2013-07-31 22:50 ` Fredrik Gustafsson
2013-08-01 7:28 ` Jakub Narebski [this message]
2013-08-02 4:33 ` Jens Müller
2013-08-02 19:18 ` Jens Müller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=loom.20130801T092209-291@post.gmane.org \
--to=jnareb@gmail$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox