From: "Karl Hasselström" <kha@treskal.com>
To: Catalin Marinas <catalin.marinas@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: [RFC][StGit PATCH] Add support for merge-friendly branches
Date: Fri, 29 May 2009 13:59:20 +0200 [thread overview]
Message-ID: <20090529115920.GA14429@diana.vm.bytemark.co.uk> (raw)
In-Reply-To: <b0943d9e0905290216m3c2bb639kc951510c72212ff@mail.gmail.com>
On 2009-05-29 10:16:52 +0100, Catalin Marinas wrote:
> 2009/5/29 Karl Hasselström <kha@treskal.com>:
>
> > The situation I described looks like this:
> >
> > B--o--o--o--o--o--P--T
> >
> > Time goes from left to right. B is the stack base, P the head of
> > the public branch, T the stack top. merge_base(P, T) is P, and not
> > B.
>
> I don't check merge_base(P, T) but merge_base(P, B) to avoid the
> issues you described. So that's always B.
Ah, so that's where I got myself confused. Thanks.
--
Karl Hasselström, kha@treskal.com
www.treskal.com/kalle
prev parent reply other threads:[~2009-05-29 11:59 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-05-28 11:12 [RFC][StGit PATCH] Add support for merge-friendly branches Catalin Marinas
[not found] ` <20090528111212.21925.45527.stgit-hhZApKj8DF/YkXV2EHHjLW3o5bpOHsLO@public.gmane.org>
2009-05-28 12:12 ` Fwd: " martin f krafft
2009-05-28 12:48 ` Karl Hasselström
2009-05-28 14:38 ` Catalin Marinas
2009-05-28 14:51 ` Catalin Marinas
2009-05-29 7:20 ` Karl Hasselström
2009-05-29 8:40 ` Catalin Marinas
2009-05-29 9:12 ` Karl Hasselström
2009-05-29 10:13 ` Catalin Marinas
2009-05-29 8:37 ` Karl Hasselström
2009-05-29 9:16 ` Catalin Marinas
2009-05-29 11:59 ` Karl Hasselström [this message]
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=20090529115920.GA14429@diana.vm.bytemark.co.uk \
--to=kha@treskal.com \
--cc=catalin.marinas@gmail.com \
--cc=git@vger.kernel.org \
/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).