From: "SZEDER Gábor" <szeder@ira.uka.de>
To: Anders Melchiorsen <mail@cup.kalibalik.dk>
Cc: Alex Riesen <raa.lkml@gmail.com>,
Samuel Tardieu <sam@rfc1149.net>,
Linus Torvalds <torvalds@linux-foundation.org>,
Anders Melchiorsen <mail@cup.kalibalik.dk>,
git@vger.kernel.org
Subject: Re: [BUG] fatal error during merge
Date: Thu, 13 Nov 2008 19:09:31 +0100 [thread overview]
Message-ID: <20081113180931.GE29274@neumann> (raw)
In-Reply-To: <57814.N1gUGH5fRhE=.1226596012.squirrel@webmail.hotelhot.dk>
On Thu, Nov 13, 2008 at 06:06:52PM +0100, Anders Melchiorsen wrote:
> SZEDER Gábor wrote:
> > It doesn't matter. The test script errors out at the merge, and not
> > at the checkout. Furthermore, it doesn't matter, whether HEAD~,
> > HEAD~, or HEAD^ is checked out, the results are the same.
>
> Just to be sure, I tried reverting the commit that you bisected -- and my
> test case still fails.
Well, oddly enough, your second test case behaves somewhat differently
than the first one, at least as far as bisect is concerned. Bisect
nails down the second test case to 0d5e6c97 (Ignore merged status of
the file-level merge, 2007-04-26; put Alex on Cc). Reverting this
commit on master makes both of your test cases pass.
Gábor
next prev parent reply other threads:[~2008-11-13 18:10 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-11-13 9:22 [BUG] fatal error during merge Anders Melchiorsen
2008-11-13 13:23 ` Samuel Tardieu
2008-11-13 14:03 ` SZEDER Gábor
2008-11-13 14:25 ` Anders Melchiorsen
2008-11-13 14:26 ` Samuel Tardieu
2008-11-13 14:53 ` SZEDER Gábor
2008-11-13 17:06 ` Anders Melchiorsen
2008-11-13 18:09 ` SZEDER Gábor [this message]
2008-11-13 22:25 ` Anders Melchiorsen
2008-11-13 23:09 ` Alex Riesen
2008-11-13 23:34 ` Anders Melchiorsen
2008-11-14 0:29 ` Junio C Hamano
2008-11-14 7:16 ` Alex Riesen
2008-11-14 9:16 ` Anders Melchiorsen
-- strict thread matches above, loose matches on Subject: below --
2009-05-10 16:33 Alex Riesen
2009-05-10 23:10 ` Johannes Schindelin
2009-05-11 7:39 ` Alex Riesen
2009-05-11 7:37 ` Anders Melchiorsen
2009-05-11 8:34 ` Johannes Schindelin
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=20081113180931.GE29274@neumann \
--to=szeder@ira.uka.de \
--cc=git@vger.kernel.org \
--cc=mail@cup.kalibalik.dk \
--cc=raa.lkml@gmail.com \
--cc=sam@rfc1149.net \
--cc=torvalds@linux-foundation.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).