Places/Places Branch: Difference between revisions

Places/Places Branch (view source)

307 bytes removed , 24 May 2011

Confirmed users

595

edits

@@ Line 6: / Line 6: @@
 *hg: ssh://hg.mozilla.org/projects/places/
-== Usage  ==
+== Merge from mozilla-central ==
-. Update the active projects list below on this page.
-. Merge m-c into places. This ensures you get a trunk-like experience, and sets a baseline for performance numbers.
 <pre>hg pull ssh://hg.mozilla.org/mozilla-central/
 hg merge default
@@ Line 17: / Line 12: @@
 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 of merge then. If mozilla central has new heads due to tagged 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, 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'''.
-. check in your change (or series of changes, etc).
-. 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>