Mstone 16: Merge Instructions

[Anthony LaForge]

We've branched 16.0, at branch 912, for all platforms from trunk/src@r106036 and WebKit@r97678.  Info and instructions below:

Important Info:
Branch number is 912
Branched Chromium at revision 106036
Branched Webkit at revision 97678

Important Links:
Continuous builders: http://go/branchbuilders
Drover instructions: http://go/drover
TPM for Merge Approvals: laforge (using the Merge-Requested workflow, below)

Key Dates:
String/Feature freeze - already passed!  If you have an exception, notify us TODAY
Beta - Target date is November 1st, 2011 (Tuesday)
Stable - December 13th, 2011 (Tuesday)

A Note About Bugs:
All bugs that are not regression or release blocking bugs will be moved to M17 tomorrow AM.  If you believe a bug you are assigned needs to be in M16 and has been moved, please move it back and tag it with ReleaseBlock-Beta for consideration.

Instructions for merging changes from trunk:

1. Have your change checked into the trunk, and passed through either a Canary build or Dev channel release before asking for merge approval
2. Tag your bug with the correct labels: milestone (Mstone-16), release it is blocking (ReleaseBlock-[Dev, Beta, Stable]), and Merge-Requested.
3. Wait for your merge to be approved by the TPM who owns the branch (laforge@).  This will trigger an email or IM notification that your bug has been approved to land.
4. Land your change using drover, or by hand.  Watch the continuous builders to ensure you have not caused any issues.
5. Assuming all is well, resolve your bug, or retarget and remove keywords.

[Lei Zhang]

BTW, when merging from trunk to the 912 branch, please be careful and
pay attention to the recent changes in the content/ refactoring. The
beta branch builder has failed to compile on several occasions this
week.

Here's a partial list of classes that did not have the content
namespace on the 912 branch:

content::Details
content::NotificationObserver
content::NotificationService
content::Source
content::URLFetcher

> --
> Chromium Developers mailing list: chromi...@chromium.org
> View archives, change email options, or unsubscribe:
> http://groups.google.com/a/chromium.org/group/chromium-dev
>