68
edits
Firefox/Projects/TabCandy/Work: Difference between revisions
Jump to navigation
Jump to search
no edit summary
No edit summary |
No edit summary |
||
| Line 73: | Line 73: | ||
Also, make sure to read http://blog.bonardo.net/2010/06/22/so-youre-about-to-use-checkin-needed | Also, make sure to read http://blog.bonardo.net/2010/06/22/so-youre-about-to-use-checkin-needed | ||
= Merging mozilla-central to tabcandy-central = | |||
# Find a stable build at http://tests.themasta.com/tinderboxpushlog/ (no reds, no unstarred oranges, no gray Bs), and grab its revision number | |||
# Make sure your local tabcandy-central repo is up to date and there's no outgoing changes pending or uncommitted work | |||
# '''hg pull -r''' <revision> '''ssh://hg.mozilla.org/mozilla-central''' | |||
# '''hg merge''' | |||
# Fix conflicts if there are any (once you've fixed them, you can use '''hg resolve -ma''' to mark them all as resolved) | |||
# '''hg ci -m 'Merge mozilla-central to tabcandy-central.'''' | |||
# '''hg push''' | |||
Also, don't forget to rebuild minefield with all the new code to make sure nothing's broken. Whether you do this before or after pushing is up to your sense of risk. :) | |||
= Code Documentation = | = Code Documentation = | ||