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 19:51, 24 March 2014
, 24 March 2014no edit summary
No edit summary |
No edit summary |
||
| Line 20: | Line 20: | ||
* hg qref | * hg qref | ||
** Not sure why this is needed, but it is | ** Not sure why this is needed, but it is | ||
* hg qpop | |||
* find the last update changeset - there will be two, one for landing the upstream code, one for the rollup of any changes | |||
** We'll call these revs "upstream_changeset" and "rollup_changeset" | |||
* hg diff -r upstream_changeset media/webrtc/trunk/webrtc >/tmp/rollup.patch | |||
* hg qpush | |||
* hg qimport /tmp/rollup.patch | |||
* hg qpush 2>&1 >/tmp/apply.out | |||
* Have much fun resolving conflicts! | |||
** watch for renamed files, or removed files with the code merged into others | |||
* 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 | |||
(incomplete, WIP) | (incomplete, WIP) | ||