From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ian Campbell Subject: Re: [RFC for-4.7] Switching to a single qemu tree each per qemu-xen and qemu-trad Date: Thu, 30 Jul 2015 15:46:45 +0100 Message-ID: <1438267605.11600.363.camel@citrix.com> References: <1438266156.11600.347.camel@citrix.com> <21946.13738.269462.357206@mariner.uk.xensource.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <21946.13738.269462.357206@mariner.uk.xensource.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: Ian Jackson Cc: Stefano Stabellini , Jan Beulich , xen-devel List-Id: xen-devel@lists.xenproject.org On Thu, 2015-07-30 at 15:33 +0100, Ian Jackson wrote: > Ian Campbell writes ("[RFC for-4.7] Switching to a single qemu tree each > per qemu-xen and qemu-trad"): > ... > > qemu-xen-traditional: > ... > > XXX why do staging/* exist, and what pushes from staging to the > > other? > > Should we ditch one or the other? > > Once upon a time, some of these had their own push gate. They are > nowadays always pushed together. The staging branches should be > abolished. Thanks, I suspect as much. > > The main open question is what to do about the existing split repos for > > existing stable branches. We could: > > > > * Teach osstest (ap-push) to push to the old tree as well as the > > new > > for existing (<= 4.6) branches only. > > * Push a Config.mk update to every stable branch and retire the > > existing trees on the next relevant point release, if there is > > one. > > We could do both of these, so we have a transitional period. That could work, yes. e.g. perhaps do the dual push until the corresponding point release happens?