Confirmed users
595
edits
Places/Places Branch: Difference between revisions
→Usage
m (Correct HG URL.) |
(→Usage) |
||
| Line 13: | Line 13: | ||
<pre>hg pull ssh://hg.mozilla.org/mozilla-central/ | <pre>hg pull ssh://hg.mozilla.org/mozilla-central/ | ||
hg merge | hg merge default | ||
hg commit -m "Merge mozilla-central into Places branch" | hg commit -m "Merge mozilla-central into Places branch" | ||
hg push </pre> | hg push </pre> | ||
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. If mozilla central has new heads due to releases you should ''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. | ||
3. check in your change (or series of changes, etc). | 3. check in your change (or series of changes, etc). | ||
4. backout your change when you've completed your work, and update this page. | 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> | |||
== Current Active Projects<br> == | == Current Active Projects<br> == | ||