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 03:36, 29 November 2016
, 29 November 2016rolling forward in more detail
(Added clarification to the extra hg qref step.) |
(rolling forward in more detail) |
||
| Line 53: | Line 53: | ||
* hg diff -r old_head media/webrtc/trunk/webrtc >/tmp/updates | * hg diff -r old_head media/webrtc/trunk/webrtc >/tmp/updates | ||
** If empty, jump ahead to land (unlikely) | ** If empty, jump ahead to land (unlikely) | ||
* hg qpush (hopefully shouldn't get conflicts -- should be webrtc_revXXXX) | * patch -p1 -R </tmp/updates | ||
* hg qnew undo_new_head_back_to_old_head.patch | |||
** new_head is the new hg tip changeset id, old_head is the old one | |||
* hg qref | |||
** Not sure why this is needed, but it is normally | |||
* hg qpush (hopefully shouldn't get conflicts -- should be webrtc_revXXXX) | |||
* hg qpop | |||
* hg qfold | |||
* hg qrename webrtc_revXXXXX | |||
** Now we should have one webrtc_revXXXX patch | |||
* hg qpush (should be rollup.patch) | * hg qpush (should be rollup.patch) | ||
* hg qfold rollup_fixes (merges into rollup.patch) | * hg qfold rollup_fixes (merges into rollup.patch) | ||