Re: [RFC][StGit PATCH] Add support for merge-friendly branches

On 2009-05-29 10:16:52 +0100, Catalin Marinas wrote:

2009/5/29 Karl Hasselström [off-list ref]:

quoted

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