From: Catalin Marinas <catalin.marinas@arm.com>
To: "Karl Hasselström" <kha@treskal.com>
Cc: Steven Grimm <koreth@midwinter.com>, "'git'" <git@vger.kernel.org>
Subject: Re: StGIT vs. guilt: What's the difference?
Date: Fri, 15 Jun 2007 15:59:24 +0100 [thread overview]
Message-ID: <tnx1wgds1pv.fsf@arm.com> (raw)
In-Reply-To: <20070615030542.GA30110@diana.vm.bytemark.co.uk> ( Karl Hasselström's message of "Thu, 14 Jun 2007 20:05:42 -0700")
Karl Hasselström <kha@treskal.com> wrote:
> On 2007-06-14 14:55:54 -0700, Steven Grimm wrote:
>
>> I've asked this on IRC a couple times and nobody seemed to have a
>> good answer, so: These two tools seem like they are solving the same
>> general problem using similar approaches. They are both under active
>> development. In what areas is each of them stronger than the other?
>> Why would one choose to use one of them instead of the other?
>
> I have never had a close look at guilt, but from what I remember it
> stores patches as plain old plaintext patches (corrections to this
> statement welcome). StGIT uses git's object database.
I haven't tried quilt either but, if it uses plain text patches, the
disadvantage might be the losing of the three-way merge when pushing a
patch onto the stack. The solution is to remember which commit the
patch applies to, switch the tree, apply the patch and merge with
HEAD.
Are the guilt patches accessible as commit objects at the top of the
stack?
StGIT might have some more features as it is older but I see a lot of
development is going on with guilt. Another difference is that StGIT
is written in Python and guilt uses shell scripts (some people don't
like the dependency on Python).
I would welcome such a discussion (so please keep me cc'ed) as we can
share the experience with various issues.
--
Catalin
next prev parent reply other threads:[~2007-06-15 15:19 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-06-14 21:55 StGIT vs. guilt: What's the difference? Steven Grimm
2007-06-15 3:05 ` Karl Hasselström
2007-06-15 14:59 ` Catalin Marinas [this message]
2007-06-15 20:01 ` Yann Dirson
2007-06-17 3:59 ` Josef Sipek
2007-06-17 8:54 ` Catalin Marinas
2007-06-17 22:28 ` Yann Dirson
2007-06-17 3:54 ` Josef Sipek
2007-06-17 8:46 ` Catalin Marinas
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=tnx1wgds1pv.fsf@arm.com \
--to=catalin.marinas@arm.com \
--cc=catalin.marinas@gmail.com \
--cc=git@vger.kernel.org \
--cc=kha@treskal.com \
--cc=koreth@midwinter.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).