Places/Places Branch: Difference between revisions

From MozillaWiki
Jump to navigation Jump to search
No edit summary
 
(25 intermediate revisions by 4 users 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/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/
<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>
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>  ==


Projects currently using the branch<br>
== Merge to mozilla-central  ==
Please annotate all the temp changesets.


14 Jan 2010: pushing async expiration parts to get talos numbers
Follow the procedure to merge from mozilla-central, then finally push the merged changeset to it with:
<pre>hg push ssh://hg.mozilla.org/mozilla-central/</pre>

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"