Re: [Qemu-devel] 64-on-32 TCG broken

[Paolo Bonzini]

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