qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Laszlo Ersek <lersek@redhat.com>
To: David Woodhouse <dwmw2@infradead.org>,
	Peter Maydell <peter.maydell@linaro.org>
Cc: "Jordan Justen (Intel address)" <jordan.l.justen@intel.com>,
	Paolo Bonzini <pbonzini@redhat.com>,
	qemu devel list <qemu-devel@nongnu.org>,
	Ard Biesheuvel <ard.biesheuvel@linaro.org>
Subject: Re: [Qemu-devel] why restrict pull reqs to signed tags?
Date: Wed, 9 Mar 2016 15:41:04 +0100	[thread overview]
Message-ID: <56E03600.2040602@redhat.com> (raw)
In-Reply-To: <2e237edf67147cad0710accce5808f35.squirrel@twosheds.infradead.org>

On 03/09/16 15:13, David Woodhouse wrote:

> The background is that they currently use a workshop which enforces
> rebasing onto the latest master, thus leading to lost history

This is exactly what the QEMU development model enforces, as I've
repeated many times. Maintainers who review and pick up your QEMU
patches will freely rebase them, reorder them against other
contributors' series they queue until their next pull, and resolve
rebase conflicts without asking you if they can.

What I may have forgotten to say (but have been reminded of) is that
maintainers are personally responsible for *testing* such rebases before
they send a PULL with them.

Nonetheless, I don't think such testing would make much difference for
you, because (a) the history would be changed anyway, which you can't
accept, and (b) IIRC I volunteered to test your (great) OpenSSL work in
practice even before you did, even without being a CryptoPkg
co-maintainer, but that still doesn't seem to give you enough confidence
in our workflow.

My point is that the workflow we currently use in edk2 is not
*inherently* broken. Many other projects, like QEMU, use it.

> and the
> potential for commits which apparently *never* worked, in cases when we
> *should* have a working commit and a subsequently broken merge. And I'm
> trying to get them to fix that and use git properly, :)

According to your description, QEMU uses git improperly, so does
libvirt, and the KVM (kernel) queue too.

Anyway, I think we're running in circles. I won't try to block this
endeavor in edk2. If (a) merges become generally accepted by the other
package maintainers in edk2, and (b) a contributor asks me personally
that his branch be pulled rather than rebased, I'll do my best to
conform, while ensuring correctness & security. Until (a&&b), I as an
edk2 co-maintainer will definitely follow the current rules.

I apologize again for the noise on qemu-devel; I'm out.

Laszlo

  reply	other threads:[~2016-03-09 14:41 UTC|newest]

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-03-09 10:20 [Qemu-devel] why restrict pull reqs to signed tags? Laszlo Ersek
2016-03-09 11:33 ` Paolo Bonzini
2016-03-09 11:35 ` Peter Maydell
2016-03-09 12:13   ` Laszlo Ersek
2016-03-09 12:19     ` Paolo Bonzini
2016-03-09 12:31       ` Laszlo Ersek
2016-03-09 12:33         ` Paolo Bonzini
2016-03-09 12:38         ` David Woodhouse
2016-03-09 12:40           ` Ard Biesheuvel
2016-03-09 12:44             ` Peter Maydell
2016-03-09 13:14               ` Laszlo Ersek
2016-03-09 12:34     ` David Woodhouse
2016-03-09 12:42       ` Peter Maydell
2016-03-09 13:09         ` David Woodhouse
2016-03-09 13:27           ` Peter Maydell
2016-03-09 14:13             ` David Woodhouse
2016-03-09 14:41               ` Laszlo Ersek [this message]
2016-03-10  8:21                 ` David Woodhouse
2016-03-10  8:52                   ` Markus Armbruster
2016-03-10 10:34                     ` David Woodhouse
2016-03-10 12:38                       ` Laszlo Ersek

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=56E03600.2040602@redhat.com \
    --to=lersek@redhat.com \
    --cc=ard.biesheuvel@linaro.org \
    --cc=dwmw2@infradead.org \
    --cc=jordan.l.justen@intel.com \
    --cc=pbonzini@redhat.com \
    --cc=peter.maydell@linaro.org \
    --cc=qemu-devel@nongnu.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).