xen-devel.lists.xenproject.org archive mirror
 help / color / mirror / Atom feed
From: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
To: xen-devel@lists.xensource.com, boris.ostrovsky@oracle.com,
	david.vrabel@citrix.com,
	Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Subject: xen/tip.git and how it should function?
Date: Tue, 30 Jul 2013 13:53:24 -0400	[thread overview]
Message-ID: <20130730175324.GA11003@phenom.dumpdata.com> (raw)

Hey Stefano, Boris, David and everybody else.


I figured that having a one Linux tree for all the maintainers to put Xen related
patches would help with:
 - Testing
 - Logistics with patches overlapping
 - More eyes - hence easier to check something.
 - Easier to backport all Xen changes.

In the past the workflow I had was to create at a certain point (rc3-ish) a
'stable' branch where I would put the patches for the next release. For example
the next one would be called 'stable/for-linus-3.12'.

During the rc3->rc7 time patches would accumulate there. Everytime a patch is put
in, the branch is called merged in the #linux-next branch. This means that linux-next
will always contain the latest from Linus tree and the latest for the next release.

Then when we are two weeks before the merge window I tag it. I create a nice signed tag
called 'stable/for-linus-3.12-rc0-tag' where I do a writeup of all patches. That is
what Linus gets in his GIT PULL.

Once the merge window is completed and we find bugs, we pile them up in this branch
(stable/for-linus-3.12). New features are put in 'stable/for-linus-3.13' .. and so
on.


This worked great for me - as I only had two bins to put things in. Oh and of course
you cannot rebase either one of those trees.

And sometimes I created an 'devel/for-XXX-3.13' which could be rebased and deleted. But
it kept the 'unstable' patches that eventually would trickle to the stable/for-XXX-3.13.

With two maintainers, this should be easy enough - each maintainer can put his or her
patches in their local tree (or some git tree). Create a 'stable/for-linus-3.12' and
do a git merge on his or her local tree, and push said 'stable/for-linus-3.12' up
to the tip tree.

Or just push them in #linux-next first to make sure they don't blow up.

Thoughts?

             reply	other threads:[~2013-07-30 17:53 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-07-30 17:53 Konrad Rzeszutek Wilk [this message]
2013-07-31 11:25 ` xen/tip.git and how it should function? Stefano Stabellini
2013-07-31 14:02   ` Konrad Rzeszutek Wilk
2013-07-31 14:10   ` Konrad Rzeszutek Wilk
2013-07-31 15:48     ` Stefano Stabellini
2013-07-31 15:57       ` Boris Ostrovsky
2013-07-31 16:11       ` David Vrabel
2013-07-31 16:22         ` Stefano Stabellini
2013-07-31 17:15           ` Konrad Rzeszutek Wilk

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=20130730175324.GA11003@phenom.dumpdata.com \
    --to=konrad.wilk@oracle.com \
    --cc=boris.ostrovsky@oracle.com \
    --cc=david.vrabel@citrix.com \
    --cc=stefano.stabellini@eu.citrix.com \
    --cc=xen-devel@lists.xensource.com \
    /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).