Places/Places Branch: Difference between revisions

From MozillaWiki
Jump to navigation Jump to search
Line 26: Line 26:
Procedure is similar to the above one, but it also involves a final:
Procedure is similar to the above one, but it also involves a final:
<pre>hg push ssh://hg.mozilla.org/mozilla-central/</pre>
<pre>hg push ssh://hg.mozilla.org/mozilla-central/</pre>
== Current Active Projects<br>  ==
status: '''BUSY'''
Projects currently using the branch<br> Please annotate all the temp changesets.
* 14 Jan 2010: pushing async expiration parts to get talos numbers - '''finished'''<br>
* 8 Feb 2010: pushed {{bug|525013}}, static libxul. [http://hg.mozilla.org/projects/places/rev/16847e179d9f changeset]. backed out. '''finished'''
* 10 Mar 2010: pushed {{bug|512584}}, backed out. Merged, and going to have rel-eng kick off 5 Ts runs for the merge, then re-land and do 5 more. '''finished'''
* 16 Mar 2010: pushed {{bug|502937}} [http://hg.mozilla.org/projects/places/rev/1bdd5872de35 changeset]. backed out. '''finished'''
* 17 Mar 2010: working on {{bug|512584}} again
* 29 Mar 2010: merged
* 1 Apr 2010: backed out bug 512584, tree is clean
* 1 Apr 2010: merging, going to test-land bug 413019
* 5 Apr 2010: backed out (dietrich)
* 22 Lug 2010: TEMP tables removal testing (mak)

Revision as of 02:06, 24 May 2011

Details

Usage

1. Update the active projects list below on this page.

2. Merge m-c into places. This ensures you get a trunk-like experience, and sets a baseline for performance numbers.

hg pull ssh://hg.mozilla.org/mozilla-central/
hg merge default
hg commit -m "Merge mozilla-central and Places branch"
hg push 

Note that if there are no different changesets with central (nothing to merge), hg merge tip will fail, you can use hg update default instead of merge then. If mozilla central has new heads due to tagged releases you should hg push -f instead, but check heads correctness with hg heads first.

3. check in your change (or series of changes, etc).

4. backout your change when you've completed your work, and update this page.

Merge to central

Procedure is similar to the above one, but it also involves a final:

hg push ssh://hg.mozilla.org/mozilla-central/