Re: [Xen-devel] Proposed force push of staging to master

[Ian Jackson <Ian.Jackson@xxxxxxxxxxxxx>]

George Dunlap writes ("Re: Proposed force push of staging to master"):
> On 02/17/2014 12:08 PM, Ian Jackson wrote:
> > So, we propose to push 4e8d89bc1445f91c4c6c7bf0ad8d51b0c809841e to
> > xen.git#master and call it RC4.  Comments welcome.
> 
> Thanks for the analysis.  This seems like a good plan.

I have done this (RC4 is tagged, tarballs are in production).

I also had to force push the change below to xen.git#master.

Can I request that we don't change this back to say "master" until we
are done with 4.4.0 ?  Either way we have to update Config.mk with new
qemu upstream versions, but if we set this to "master" in between RCs,
I end up having to do it as a force push in the middle of the RC
production which is out-of-course, error-prone, and suboptimal.

It is IMO better to put a commit hash in QEMU_UPSTREAM_REVISION in
Config.mk (updated when the qemu-upstream tree has passed its push
gate).

That is I think the best workflow is:
  * make a change to staging/qemu-upstream-unstable.git
  * wait for push gate to put it in qemu-upstream-unstable.git
  * make change to xen.git#staging to update QEMU_UPSTREAM_REVISION
    to new commit hash
  * whatever is in xen.git#master is what gets called rcN
    (ie we tag xen.git and */qemu-upstream-unstable.git with the rcN
     tags, but we don't use the actual tag name in Config.mk)

Thanks,
Ian.

From b7319350278d0220febc8a7dc8be8e8d41b0abd2 Mon Sep 17 00:00:00 2001
From: Ian Jackson <ian.jackson@xxxxxxxxxxxxx>
Date: Mon, 17 Feb 2014 16:33:48 +0000
Subject: [PATCH] Update QEMU_UPSTREAM_REVISION for 4.4.0-rc4

Signed-off-by: Ian Jackson <Ian.Jackson@xxxxxxxxxxxxx>
---
 Config.mk |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Config.mk b/Config.mk
index 1e034f7..a6cd2e3 100644
--- a/Config.mk
+++ b/Config.mk
@@ -234,7 +234,7 @@ QEMU_UPSTREAM_URL ?= 
git://xenbits.xen.org/qemu-upstream-unstable.git
 SEABIOS_UPSTREAM_URL ?= git://xenbits.xen.org/seabios.git
 endif
 OVMF_UPSTREAM_REVISION ?= 447d264115c476142f884af0be287622cd244423
-QEMU_UPSTREAM_REVISION ?= master
+QEMU_UPSTREAM_REVISION ?= qemu-xen-4.4.0-rc4
 SEABIOS_UPSTREAM_TAG ?= rel-1.7.3.1
 # Fri Aug 2 14:12:09 2013 -0400
 # Fix bug in CBFS file walking with compressed files.
-- 
1.7.10.4


_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxx
http://lists.xen.org/xen-devel