Re: [PATCH] rebase-i: keep old parents when preserving merges

Hi,

Johannes Schindelin wrote:

Hi,

On Wed, 16 Jul 2008, Stephan Beyer wrote:

quoted

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 [off-list ref], PGP 0x6EDDD207FCC5040F