From: Stephan Beyer <s-beyer@gmx.net>
Date: Wed, 16 Jul 2008 09:43:01 GMT
Subject: Re: [PATCH] rebase-i: keep old parents when preserving merges
Message-ID: <20080716094301.GA25087@leksak.fem-net>
In-Reply-To: <alpine.DEB.1.00.0807160432480.2841@eeepc-johanness>

Hi,

Johannes Schindelin wrote:
> Hi,
> 
> On Wed, 16 Jul 2008, Stephan Beyer wrote:
> 
> > This patch fixes two issues for rebase -i with preserving
> > merges of unrelated branches.
> 
> Two?  What's the second?

Oh, eh, well ;)
It's only one bug, but it results in two different behaviors...
If you have a merge with more than two parents and not all are lost,
then it merges with too few parents.
If you have a merge with exactly two parents and one is lost, then
it tries to cherry-pick (with an error).
"Two" "issues" :)

Regards.
  Stephan

-- 
Stephan Beyer <s-beyer@gmx.net>, PGP 0x6EDDD207FCC5040F