canmove, Confirmed users
6,441
edits
ReleaseEngineering/How To/Land Buildbot Master Changes: Difference between revisions
Jump to navigation
Jump to search
ReleaseEngineering/How To/Land Buildbot Master Changes (view source)
Revision as of 21:27, 6 December 2010
, 6 December 2010→Update the Masters
| Line 52: | Line 52: | ||
== Update the Masters == | == Update the Masters == | ||
== Merging Tips == | |||
=== Previewing a Merge === | |||
To see which changesets will be merged without affecting your local repository, update to the production branch you plan to update, and run "hg merge -P". For example, to preview a merge from the 0.8 default branch in buildbotcustom, do the following: | |||
hg up -r production-0.8 | |||
hg merge -P default | |||
To preview a merge in the same repository, but on 0.7, do the following: | |||
hg up -r production-0.7 | |||
hg merge -P buildbot-0.7 | |||
=== Merging === | |||
To perform the merge, use the same merge command as above, without "-P". For example: | |||
hg up -r production-0.8 | |||
hg merge default | |||
You will need to commit this merge. It's advisable to include a summary of what's been merged in the commit message. For example: | |||
hg commit -m "Merge bugs 616320, 616583, and 615097 from default branch" | |||