Re: [Xen-devel] [PATCH OSSTEST] Switch to merged qemu-xen{, -traditional}.git trees

2015-10-29 Thread Ian Jackson
Ian Campbell writes ("Re: [Xen-devel] [PATCH OSSTEST] Switch to merged qemu-xen{, -traditional}.git trees"): > Copied from xen.git/config. I also copied xen.git/hooks/pre-receive which > prevents pushes to non-staging branches (except by osstest) and prevents > pushes of unann

Re: [Xen-devel] [PATCH OSSTEST] Switch to merged qemu-xen{, -traditional}.git trees

2015-10-21 Thread Ian Campbell
On Wed, 2015-10-21 at 15:12 +0100, Ian Campbell wrote: > On Wed, 2015-10-21 at 14:15 +0100, Ian Campbell wrote: > > > * Remove the old staging/qemu-upstream-* trees, they are not > > >referenced by anything. > > > > Done (by move aside a discussed above). > > This was premature and I have pu

Re: [Xen-devel] [PATCH OSSTEST] Switch to merged qemu-xen{, -traditional}.git trees

2015-10-21 Thread Ian Campbell
On Wed, 2015-10-21 at 14:15 +0100, Ian Campbell wrote: > > * Remove the old staging/qemu-upstream-* trees, they are not > >referenced by anything. > > Done (by move aside a discussed above). This was premature and I have put them back. The reason is that all osstest flights prior to the upd

Re: [Xen-devel] [PATCH OSSTEST] Switch to merged qemu-xen{, -traditional}.git trees

2015-10-21 Thread Ian Campbell
On Wed, 2015-10-21 at 14:15 +0100, Ian Campbell wrote: > /home/xen/git qemu-xen.git#staging > xen-stag...@lists.xensource.com xen-de...@lists.xensource.com > /home/xen/git qemu-xen.git#staging-4.6 > xen-stag...@lists.xensource.com xen-de...@lists.xensource.co

Re: [Xen-devel] [PATCH OSSTEST] Switch to merged qemu-xen{, -traditional}.git trees

2015-10-21 Thread Ian Campbell
On Tue, 2015-10-20 at 11:34 +0100, Ian Campbell wrote: > On Mon, 2015-10-19 at 12:44 +0100, Ian Jackson wrote: > > Ian Campbell writes ("Re: [PATCH OSSTEST] Switch to merged qemu-xen{, > > -traditional}.git trees"): > > > We discussed on IRC with you and Stefano and are going to aim to push > > > t

Re: [Xen-devel] [PATCH OSSTEST] Switch to merged qemu-xen{, -traditional}.git trees

2015-10-21 Thread Ian Campbell
On Tue, 2015-10-20 at 11:34 +0100, Ian Campbell wrote: > On Mon, 2015-10-19 at 12:44 +0100, Ian Jackson wrote: > > Ian Campbell writes ("Re: [PATCH OSSTEST] Switch to merged qemu-xen{, > > -traditional}.git trees"): > > > We discussed on IRC with you and Stefano and are going to aim to push > > > t

Re: [Xen-devel] [PATCH OSSTEST] Switch to merged qemu-xen{, -traditional}.git trees

2015-10-21 Thread Ian Campbell
On Wed, 2015-10-21 at 11:35 +0100, Ian Jackson wrote: > Ian Campbell writes ("Re: [Xen-devel] [PATCH OSSTEST] Switch to merged > qemu-xen{, -traditional}.git trees"): > > On Tue, 2015-10-20 at 11:34 +0100, Ian Campbell wrote: > > > * See if there is a way to preve

Re: [Xen-devel] [PATCH OSSTEST] Switch to merged qemu-xen{, -traditional}.git trees

2015-10-21 Thread Ian Jackson
Ian Campbell writes ("Re: [Xen-devel] [PATCH OSSTEST] Switch to merged qemu-xen{, -traditional}.git trees"): > On Tue, 2015-10-20 at 11:34 +0100, Ian Campbell wrote: > > * See if there is a way to prevent pushes to the old trees (e.g. a > >setting in their .git/conf

Re: [Xen-devel] [PATCH OSSTEST] Switch to merged qemu-xen{, -traditional}.git trees

2015-10-21 Thread Ian Campbell
On Tue, 2015-10-20 at 11:34 +0100, Ian Campbell wrote: > * See if there is a way to prevent pushes to the old trees (e.g. a >setting in their .git/config file). It appears that it is trivial to block force pushes or pushes to the current branch (which I think might be meaningless for a bare

Re: [Xen-devel] [PATCH OSSTEST] Switch to merged qemu-xen{, -traditional}.git trees

2015-10-20 Thread Ian Campbell
On Mon, 2015-10-19 at 12:44 +0100, Ian Jackson wrote: > Ian Campbell writes ("Re: [PATCH OSSTEST] Switch to merged qemu-xen{, > -traditional}.git trees"): > > We discussed on IRC with you and Stefano and are going to aim to push > > this > > in the w/c 19 October. > > We have decided under the cir

Re: [Xen-devel] [PATCH OSSTEST] Switch to merged qemu-xen{, -traditional}.git trees

2015-10-19 Thread Ian Jackson
Ian Campbell writes ("Re: [PATCH OSSTEST] Switch to merged qemu-xen{,-traditional}.git trees"): > We discussed on IRC with you and Stefano and are going to aim to push this > in the w/c 19 October. We have decided under the circumstances to postpone this to next week. It would probably have been

Re: [Xen-devel] [PATCH OSSTEST] Switch to merged qemu-xen{, -traditional}.git trees

2015-10-05 Thread Ian Jackson
Ian Campbell writes ("Re: [PATCH OSSTEST] Switch to merged qemu-xen{,-traditional}.git trees"): > Yes, v2 is below for completeness. I rebased this over the smoketest stuff > which added $xenbranch_forqemu which of course is now no longer needed so > the rebase just involved taking my version of e

Re: [Xen-devel] [PATCH OSSTEST] Switch to merged qemu-xen{, -traditional}.git trees

2015-10-02 Thread Ian Campbell
On Fri, 2015-10-02 at 14:43 +0100, Ian Jackson wrote: > Ian Campbell writes ("Re: [PATCH OSSTEST] Switch to merged qemu-xen{, > -traditional}.git trees"): > > $branch is a bit wordy at this point, but $branchcore is usable for > > both > > cases incrementally: > > LGTM. > > Acked-by: Ian Jackson

Re: [Xen-devel] [PATCH OSSTEST] Switch to merged qemu-xen{, -traditional}.git trees

2015-10-02 Thread Ian Jackson
Ian Campbell writes ("Re: [PATCH OSSTEST] Switch to merged qemu-xen{,-traditional}.git trees"): > $branch is a bit wordy at this point, but $branchcore is usable for both > cases incrementally: LGTM. Acked-by: Ian Jackson (I assume you'll fold this in.) Ian. _

Re: [Xen-devel] [PATCH OSSTEST] Switch to merged qemu-xen{, -traditional}.git trees

2015-09-17 Thread Ian Campbell
On Thu, 2015-09-17 at 11:43 +0100, Ian Campbell wrote: > > > +qemu-upstream-*-testing) > > ... > > > + # For now also push to the old split trees for historical > > > + # branches only (qemu-upstream started with xen-4.2-testing > > > + # and the split trees end at xen-4.6-testing) > > > + case "$x

Re: [Xen-devel] [PATCH OSSTEST] Switch to merged qemu-xen{, -traditional}.git trees

2015-09-17 Thread Ian Campbell
On Thu, 2015-09-17 at 11:31 +0100, Ian Jackson wrote: > Ian Campbell writes ("[PATCH OSSTEST] Switch to merged qemu-xen{, > -traditional}.git trees"): > > The qemu-mainline flights now push to the upstream-tested branch of > > qemu-xen.git (while still pulling from upstream). > > This mostly looks

Re: [Xen-devel] [PATCH OSSTEST] Switch to merged qemu-xen{, -traditional}.git trees

2015-09-17 Thread Ian Jackson
Ian Campbell writes ("[PATCH OSSTEST] Switch to merged qemu-xen{,-traditional}.git trees"): > The qemu-mainline flights now push to the upstream-tested branch of > qemu-xen.git (while still pulling from upstream). This mostly looks fine. How are we going to test this ? I think the most practica

[Xen-devel] [PATCH OSSTEST] Switch to merged qemu-xen{, -traditional}.git trees

2015-09-17 Thread Ian Campbell
The qemu-mainline flights now push to the upstream-tested branch of qemu-xen.git (while still pulling from upstream). The qemu-upstream-unstable flights pull from staging and push to master in qemu-xen.git All of the qemu-upstream-X.Y-testing pull from staging-X.Y and push to stable-X.Y branch in