Tree Rules: Difference between revisions

Tree Rules (view source)

3 bytes removed , 15 August 2014

m

canmove, Confirmed users

1,126

edits

@@ Line 14: / Line 14: @@
 * If your patch is eligible for direct-landing on mozilla-central:
 ** Use the ''a=reason'' examples given above, to bypass the Mercurial hook used to prevent accidental pushes. Note: That whilst we are using the "a=" syntax (since that's all the hook supports for now), this is unrelated to the "release-driver approval request" process - so please do not request approval from them in Bugzilla.
-*** Note if merging into mozilla-central, and your push didn't generate a merge commit (and so you have nowhere to put the "a=merge" to get past the hook, then either temporarily set the tree state to OPEN, try merging a different integration repo first (which may need a merge commit) or else add an empty mq commit on top with an appropriate commit message.
+*** Note if merging into mozilla-central, and your push didn't generate a merge commit (and so you have nowhere to put the "a=merge" to get past the hook), then either temporarily set the tree state to OPEN, try merging a different integration repo first (which may need a merge commit), or add an empty mq commit on top with an appropriate commit message.
 ** Changes must meet the [https://developer.mozilla.org/En/Developer_Guide/Committing_Rules_and_Responsibilities general checkin rules].
 ** You must check the tree is green before pushing, notify the sheriffs in #developers and then watch mozilla-central for failures.