Confirmed users
2,317
edits
Sheriffing/How To/Merges: Difference between revisions
Jump to navigation
Jump to search
no edit summary
(updated repositories, wrote full repository names to optimize it for search, replaced mcmerge with Bugherder) |
No edit summary |
||
| Line 33: | Line 33: | ||
Aliases for the various repositories make the above easier to type! | Aliases for the various repositories make the above easier to type! | ||
= Step 3 hg update when there is nothing to merge = | |||
You get the run 'hg update' to get a working copy information, because there where no changes on m-c and so nothing to merge. The workflow for this case is: | |||
1.) Run hg update | |||
-- If unsure if everything is ok just do a hg out, that should list all the changesets you want to sync to m-c | |||
2.) because you do no merge and so have no commits like "merge a to b a=me" you would run into a hg hook telling you that the m-c repo is set to approval-only - so you need to temporary need to set the mozilla-central tree to "open" via tree-status to be able to push | |||
3.) Push your changes from Step 1 | |||
4.) Set the m-c tree back to approval-required. This is important because if we miss this, we risk unexpected pushes to mozilla-central since some people might think the open tree is intentional :) | |||
5.) Use Bugherder to mark the bugs as usual | |||
6.) now when you do the Steps from Step 1 with mozilla-inbound you get the note that you need to merge. | |||