Places/Places Branch

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/