From: Daiane Angolini <daiane.angolini@freescale.com>
To: "meta-freescale@yoctoproject.org" <meta-freescale@yoctoproject.org>
Subject: Merge protocol - proposal
Date: Tue, 4 Jun 2013 15:26:55 -0300 [thread overview]
Message-ID: <51AE316F.4040109@freescale.com> (raw)
I know I'm completely late about "Merge Protocol Proposal" I had said I
would send it 2 weeks after the release. And I do have a lot of excuses
(or runarounds), but it doesn't matter.
Please, see below my proposal for merge protocol. I hope we can get at
least 10 people "voting" on this topic.
Please, let me know what you think.
Regards,
Daiane
*Development branch*
Any development or bug fix MUST be done over master at first. If you
need any bugfix on your stable branch, you MUST fix the same bug on
master, except when it is not applicable to master, for example (e.g:
newer BSP release has fixed the bug).
The standard review window for new features will be of one week, unless
cover letter expands this period. New patch versions expands the review
window by one day.
The standard review window for bugfixes is one day, unless cover letter
expands this period. New patch versions expands the review window by one
day.
In case the patch has no comment, it will be applied after the review
window.
*Stable branch*
No new feature will be accepted
Any bugfix backported to any stable branch will have one week for
review, unless cover letter expands this period.
In case of no comment, the patch will be merged in stable-next branch
(dylan-next, danny-next).
Every friday any patch on stable-next branch will be merged on stable
branch, unless any comment or bug reported. The patches sent to
stable-next must have been applied in master before (unless not applicable).
next reply other threads:[~2013-06-04 18:28 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-06-04 18:26 Daiane Angolini [this message]
2013-06-05 12:21 ` Merge protocol - proposal Otavio Salvador
2013-06-09 19:24 ` Christian Betz
2013-06-09 19:58 ` Otavio Salvador
2013-06-12 18:00 ` Daiane Angolini
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=51AE316F.4040109@freescale.com \
--to=daiane.angolini@freescale.com \
--cc=meta-freescale@yoctoproject.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.