From: Stephan Beyer <s-beyer@gmx.net>
To: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Cc: git@vger.kernel.org
Subject: Re: [PATCH] rebase-i: keep old parents when preserving merges
Date: Wed, 16 Jul 2008 11:43:01 +0200 [thread overview]
Message-ID: <20080716094301.GA25087@leksak.fem-net> (raw)
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
next prev parent reply other threads:[~2008-07-16 9:44 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-07-16 1:51 [PATCH] rebase-i: keep old parents when preserving merges Stephan Beyer
2008-07-16 2:26 ` Stephan Beyer
2008-07-16 2:33 ` Johannes Schindelin
2008-07-16 9:43 ` Stephan Beyer [this message]
2008-07-16 10:24 ` Johannes Schindelin
2008-07-16 21:36 ` Junio C Hamano
2008-07-16 21:51 ` Stephan Beyer
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=20080716094301.GA25087@leksak.fem-net \
--to=s-beyer@gmx.net \
--cc=Johannes.Schindelin@gmx.de \
--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).