From: Paolo Bonzini <pbonzini@redhat.com>
To: Peter Maydell <peter.maydell@linaro.org>
Cc: Stefan Weil <sw@weilnetz.de>, qemu-devel <qemu-devel@nongnu.org>,
Aurelien Jarno <aurelien@aurel32.net>
Subject: Re: [Qemu-devel] 64-on-32 TCG broken
Date: Wed, 31 Oct 2012 15:08:41 +0100 [thread overview]
Message-ID: <509130E9.8070902@redhat.com> (raw)
In-Reply-To: <CAFEAcA8J_5=+Z9DLYtRoVEvyriehinEtiz7kUoq3Mfu11LG+Ag@mail.gmail.com>
Il 31/10/2012 15:05, Peter Maydell ha scritto:
>> > Thanks! In general, do not rebase a branch unless you were able to test
>> > the rebase fully. Use "git merge" instead. This does not apply to
>> > people without commit access (unless they use pull requests---perhaps we
>> > should use them more), but it is easy for you.
>> >
>> > If you hadn't rebased the series, "git bisect" would have pointed out
>> > that the original series worked, and that the merge was the problem.
> I don't think this actually gains us anything, because we've still
> checked broken code into master, whether it was via a rebase or a
> merge. The correct answer is "test your commits before sending them",
> surely?
I think Aurelien did test, but only on a 64-bit host. So the idea still
holds: if you have tested more than that earlier, do not rebase.
Paolo
next prev parent reply other threads:[~2012-10-31 14:09 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-10-29 17:53 [Qemu-devel] x86_64-softmmu broken on Windows (TCG?) Paolo Bonzini
2012-10-29 18:29 ` Aurelien Jarno
2012-10-30 8:15 ` [Qemu-devel] 64-on-32 TCG broken [was Re: x86_64-softmmu broken on Windows (TCG?)] Paolo Bonzini
2012-10-30 22:24 ` [Qemu-devel] 64-on-32 TCG broken Stefan Weil
2012-10-30 23:22 ` Aurelien Jarno
2012-10-30 23:56 ` Aurelien Jarno
2012-10-31 12:40 ` Aurelien Jarno
2012-10-31 14:01 ` Paolo Bonzini
2012-10-31 14:05 ` Peter Maydell
2012-10-31 14:08 ` Paolo Bonzini [this message]
2012-10-31 15:23 ` Aurelien Jarno
2012-10-31 17:05 ` Stefan Weil
2012-10-31 21:48 ` Aurelien Jarno
2012-11-07 13:26 ` Kirill Batuzov
2012-11-11 16:05 ` Aurelien Jarno
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=509130E9.8070902@redhat.com \
--to=pbonzini@redhat.com \
--cc=aurelien@aurel32.net \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
--cc=sw@weilnetz.de \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.