Places/Places Branch: Difference between revisions

From MozillaWiki
Jump to navigation Jump to search
No edit summary
 
(6 intermediate revisions by the same user not shown)
Line 1: Line 1:
== Details ==
== Details ==


*pushlog: http://hg.mozilla.org/projects/places/pushloghtml<br>  
*pushlog: http://hg.mozilla.org/projects/places/pushloghtml<br>  
*waterfall: http://tinderbox.mozilla.org/showbuilds.cgi?tree=Places  
*waterfall: http://tinderbox.mozilla.org/showbuilds.cgi?tree=Places  
*tbpushlog: http://tests.themasta.com/tinderboxpushlog/?tree=Places  
*tbpl: http://tbpl.mozilla.org/?tree=Places  
*hg: ssh://hg.mozilla.org/projects/places/
*hg: ssh://hg.mozilla.org/projects/places/


== Usage ==
== Merge from mozilla-central ==
 
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.
 
<pre>hg pull ssh://hg.mozilla.org/mozilla-central/
<pre>hg pull ssh://hg.mozilla.org/mozilla-central/
hg merge default
hg merge default
hg commit -m "Merge mozilla-central into Places branch"
hg commit -m "Merge Places and mozilla-central"
hg push </pre>
hg push </pre>  
Note that if there are no different changesets with central (nothing to merge), hg merge tip will fail, use ''hg update default'' then. If mozilla central has new heads due to tagged releases, you may have to ''hg push -f'' instead, but '''check heads correctness with ''hg heads'' first'''.


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 releases you should ''hg push -f'' instead, but check heads correctness with ''hg heads'' first.
== Merge to mozilla-central ==


3. check in your change (or series of changes, etc).
Follow the procedure to merge from mozilla-central, then finally push the merged changeset to it with:  
 
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:
<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)

Latest revision as of 02:12, 24 May 2011

Details

Merge from mozilla-central

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

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

Merge to mozilla-central

Follow the procedure to merge from mozilla-central, then finally push the merged changeset to it with: 

hg push ssh://hg.mozilla.org/mozilla-central/
Retrieved from "https://wiki.allizom.org/index.php?title=Places/Places_Branch&oldid=311544"