Places/Places Branch: Difference between revisions

no edit summary
No edit summary
Line 14: Line 14:
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, 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 central ==
== Merge to mozilla-central ==
Procedure is similar to the above one, but it also involves a final:
 
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>
<pre>hg push ssh://hg.mozilla.org/mozilla-central/</pre>
Confirmed users
595

edits