canmove, Confirmed users
640
edits
Services/Sync/Getting Started: Difference between revisions
Jump to navigation
Jump to search
Add thorough push doc.
(Add thorough push doc.) |
|||
| Line 60: | Line 60: | ||
places = ssh://hg.mozilla.org/projects/places/ | places = ssh://hg.mozilla.org/projects/places/ | ||
mc = ssh://hg.mozilla.org/mozilla-central/ | mc = ssh://hg.mozilla.org/mozilla-central/ | ||
== Landing patches == | |||
You have items in a patch queue that you'd like to push to s-c. Here's the thorough set of steps to follow to get them into the tree (assuming you have commit access, of course). | |||
=== Make sure services-central is open and green === | |||
Check [https://tbpl.mozilla.org/?tree=Services-Central TBPL]. | |||
=== Make sure your tree is up to date === | |||
hg qpop --all | |||
hg pull -u | |||
=== Make sure that all the patches have a description === | |||
… including the bug number and a reviewer. Run <tt>hg qser -sv</tt> (omit the <tt>-sv</tt> if you're using the config above). The output will look something like | |||
0 U favicons-1a: Bug 675996 - Part 1: extend moz_favicons with GUID to support Sync. r=mak | |||
1 U favicons-1b: Bug 675996 - Part 2: adjust Places migration tests to expect current version, not v11; tests for GUIDs in favicons. r=mak | |||
If they don't, <tt>hg qpush</tt> each one and edit the summary with <tt>hg qref -e</tt>. | |||
=== Ensure that the only patches you have applied are the ones you want to push === | |||
… and that they're the ones that were reviewed. You can reorder patches by <tt>hg qpop --all</tt> then <tt>hg qpush --move $patchname</tt>, or by manually reordering .hg/patches/series. ''Only edit the series file when all patches have been popped.'' | |||
Applied patches are indicated by an 'A' in the 2nd column of qseries. Unapplied are 'U'. | |||
=== Run tests === | |||
Now is a great time to run tests, because this is the state in which services-central will be after you push. If you apply a <tt>tests</tt> patch to re-enable disabled tests, ''make sure you pop it when you're done''. | |||
=== Finish the applied patches === | |||
hg qfinish --applied | |||
=== Verify what you're going to upload === | |||
hg out | |||
If the command shows anything other than the patches you're expecting (or they're wrong in some way), ''stop'' and ask for help. | |||
=== Push! === | |||
If all is good, push: | |||
hg push | |||
= Repositories = | = Repositories = | ||