120
edits
(Tidy up the workflow) |
|||
Line 219: | Line 219: | ||
Bugs which are fixed in tracemonkey are marked as 'fixed-in-tracemonkey' on the bugzilla whiteboard for the bug. When sayrer merges the code into mozilla-central, those bugs are marked as fixed. | Bugs which are fixed in tracemonkey are marked as 'fixed-in-tracemonkey' on the bugzilla whiteboard for the bug. When sayrer merges the code into mozilla-central, those bugs are marked as fixed. | ||
=== Mercurial Queues === | ==== Mercurial Queues ==== | ||
Since most of our lives revolve around patches, and we use Mercurial, nearly everybody uses Mercurial queues. | Since most of our lives revolve around patches, and we use Mercurial, nearly everybody uses Mercurial queues. | ||
Line 225: | Line 225: | ||
Queues are based on the idea of patch management. Each queue consists of a series of patches, applied sequentially. The aim of the game is to split potential commits into simple, bite-sized chunks which are easy to review. This also makes it simple to experiment without polluting your existing work on a bug, to spin parts off into new bugs, and to rapidly apply and unapply patches (as demonstrated in the tutorial above). | Queues are based on the idea of patch management. Each queue consists of a series of patches, applied sequentially. The aim of the game is to split potential commits into simple, bite-sized chunks which are easy to review. This also makes it simple to experiment without polluting your existing work on a bug, to spin parts off into new bugs, and to rapidly apply and unapply patches (as demonstrated in the tutorial above). | ||
==== Enabling ==== | ===== Enabling ===== | ||
Add the following snippet to your .hgrc file to enable MQ | Add the following snippet to your .hgrc file to enable MQ | ||
Line 232: | Line 232: | ||
mq = | mq = | ||
==== Example MQ workflow ==== | ===== Example MQ workflow ===== | ||
Clone the repository to deal with a bug: | Clone the repository to deal with a bug: |
edits