ReleaseEngineering/How To/Land Buildbot Master Changes: Difference between revisions

ReleaseEngineering/How To/Land Buildbot Master Changes (view source)

100 bytes removed , 22 February 2011

Confirmed users

3,990

edits

@@ Line 71: / Line 71: @@
 To perform the merge, use the same merge command as above, without "-P". For example:
   hg up -r production-0.8
+ hg merge -P default > preview_changes.txt #for documentation purposes
   hg merge default
+  hg commit -l preview_changes.txt
-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"
 === Pushing ===