Confirmed users
502
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 17:47, 3 March 2014
, 3 March 2014→Merging
| Line 63: | Line 63: | ||
To perform the merge, use the same merge command as above, without "-P". For example: | To perform the merge, use the same merge command as above, without "-P". For example: | ||
hg up -r production-0.8 | hg up -r production-0.8 | ||
echo "Merging | echo "Merging default -> production" > preview_changes.txt | ||
hg merge -P default >> preview_changes.txt #for documentation purposes | hg merge -P default >> preview_changes.txt #for documentation purposes | ||
hg merge default | hg merge default | ||