Places/Places Branch: Difference between revisions

← Older edit

Places/Places Branch (view source)

Revision as of 02:12, 24 May 2011

27 bytes removed , 24 May 2011

no edit summary

Mak77

Confirmed users

595

edits

@@ Line 1: / Line 1: @@
-== Details ==
+== Details  ==
 *pushlog: http://hg.mozilla.org/projects/places/pushloghtml<br>
 *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/place/
+*hg: ssh://hg.mozilla.org/projects/places/
-== Merges  ==
+== Merge from mozilla-central  ==
-=== Merge m-c into places  ===
 <pre>hg pull ssh://hg.mozilla.org/mozilla-central/
-hg merge tip
+hg merge default
-hg commit
+hg commit -m "Merge Places and mozilla-central"
 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.
-== Current Active Projects<br>  ==
-status: '''clean and available'''
-Projects currently using the branch<br> Please annotate all the temp changesets.
+== Merge to mozilla-central  ==
-* 14 Jan 2010: pushing async expiration parts to get talos numbers - '''finished'''<br>
+Follow the procedure to merge from mozilla-central, then finally push the merged changeset to it with:
-* 8 Feb 2010: pushed {{bug|525013}}, static libxul. [http://hg.mozilla.org/projects/places/rev/16847e179d9f changeset]. backed out.
+<pre>hg push ssh://hg.mozilla.org/mozilla-central/</pre>