Confirmed users
325
edits
Media/WebRTC/Legacy Updating Process: Difference between revisions
Jump to navigation
Jump to search
Media/WebRTC/Legacy Updating Process (view source)
Revision as of 15:19, 26 March 2014
, 26 March 2014no edit summary
No edit summary |
No edit summary |
||
| Line 32: | Line 32: | ||
* hg qnew rollup_fixes | * hg qnew rollup_fixes | ||
** don't merge them in yet to rollup, since likely you'll need to revise this for a while and it helps to see what your merge-resolution was | ** don't merge them in yet to rollup, since likely you'll need to revise this for a while and it helps to see what your merge-resolution was | ||
* do builds, resolve any errors, hg qref | |||
* submit Try builds | |||
* Go back and fix any android/b2g-specific files where we didn't merge the diffs earlier | |||
* Test in person-to-person calls | |||
Now groom for release when ready | |||
* hg qpop -a | |||
* record the current changeset from hg log ("old_head") | |||
* hg pull -u | |||
* hg diff -r old_head media/webrtc/trunk/webrtc >/tmp/updates | |||
* hg qpush (hopefully shouldn't get conflicts -- should be webrtc_revXXXX) | |||
* hg qpush (should be rollup.patch) | |||
* hg qfold rollup_fixes (merges into rollup.patch) | |||
* hg qimport /tmp/updates | |||
* hg qpush | |||
* resolve any conflicts | |||
* build | |||
* test | |||
* hg qpop | |||
* hg qfold updates | |||
* Verify that there are no changes to media/webrtc/trunk/webrtc since the diff that generated /tmp/apply (hg qpop -a; hg log ("new_head"); hg pull -u; hg diff -r new_head -> should yield nothing) | |||
* land | |||
(incomplete, WIP) | (incomplete, WIP) | ||