Confirmed users
1,989
edits
ReleaseEngineering/How To/Land Buildbot Master Changes: Difference between revisions
Jump to navigation
Jump to search
m
ReleaseEngineering/How To/Land Buildbot Master Changes (view source)
Revision as of 21:50, 26 June 2013
, 26 June 2013→Merging
m (→Merging) |
|||
| Line 72: | Line 72: | ||
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 from default | echo "Merging from default" > 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 | ||