Confirmed users
2,456
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 14:18, 10 May 2011
, 10 May 2011→Merging
| Line 71: | Line 71: | ||
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 | ||
hg merge -P default > preview_changes.txt #for documentation purposes | echo "Merging from default\n" > preview_changes.txt | ||
hg merge -P default >> preview_changes.txt #for documentation purposes | |||
hg merge default | hg merge default | ||
hg commit -l preview_changes.txt | hg commit -l preview_changes.txt | ||