Home » Mailing list archives » git » 2008 » July » 16

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

!MAILaRCHIVE_VOTE_RePLACE
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
[view in full thread]
From: Stephan Beyer <s-beyer@...>
To: Johannes Schindelin <Johannes.Schindelin@...>
Cc: <git@...>
Subject: Re: [PATCH] rebase-i: keep old parents when preserving merges
Date: Wednesday, July 16, 2008 - 5:43 am

Hi,

Johannes Schindelin wrote:

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
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
Messages in current thread:
[PATCH] rebase-i: keep old parents when preserving merges, Stephan Beyer, (Tue Jul 15, 9:51 pm)
Re: [PATCH] rebase-i: keep old parents when preserving merges, Junio C Hamano, (Wed Jul 16, 5:36 pm)
Re: [PATCH] rebase-i: keep old parents when preserving merges, Stephan Beyer, (Wed Jul 16, 5:51 pm)
Re: [PATCH] rebase-i: keep old parents when preserving merges, Johannes Schindelin, (Tue Jul 15, 10:33 pm)
Re: [PATCH] rebase-i: keep old parents when preserving merges, Stephan Beyer, (Wed Jul 16, 5:43 am)
Re: [PATCH] rebase-i: keep old parents when preserving merges, Johannes Schindelin, (Wed Jul 16, 6:24 am)
Re: [PATCH] rebase-i: keep old parents when preserving merges, Stephan Beyer, (Tue Jul 15, 10:26 pm)