Places/Places Branch: Difference between revisions
< Places
Jump to navigation
Jump to search
No edit summary |
No edit summary |
||
| (One intermediate revision 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 | ||
* | *tbpl: http://tbpl.mozilla.org/?tree=Places | ||
*hg: ssh://hg.mozilla.org/projects/places/ | *hg: ssh://hg.mozilla.org/projects/places/ | ||
== Merge from mozilla-central == | == Merge from mozilla-central == | ||
<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 | 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, 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'''. | ||
Latest revision as of 02:12, 24 May 2011
Details
- pushlog: http://hg.mozilla.org/projects/places/pushloghtml
- waterfall: http://tinderbox.mozilla.org/showbuilds.cgi?tree=Places
- tbpl: http://tbpl.mozilla.org/?tree=Places
- hg: ssh://hg.mozilla.org/projects/places/
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/