119
edits
Media/WebRTC/libwebrtc Update Process: Difference between revisions
Media/WebRTC/libwebrtc Update Process (view source)
Revision as of 16:41, 12 February 2024
, 12 February 2024added note to run in bash
(s/first/most recent/) |
(added note to run in bash) |
||
| Line 87: | Line 87: | ||
=== Recovering from errors === | === Recovering from errors === | ||
* If a particularly complicated rebase conflict is encountered, it is possible to start over the most recent vendoring step by resetting some state and restoring the patch stack. | * If a particularly complicated rebase conflict is encountered, it is possible to start over the most recent vendoring step by resetting some state and restoring the patch stack. Run these commands in a bash shell: | ||
rm .moz-fast-forward/*.resume # resets the resume logic in loop-ff.sh | rm .moz-fast-forward/*.resume # resets the resume logic in loop-ff.sh | ||
hg revert third_party/libwebrtc && hg purge third_party/libwebrtc | hg revert third_party/libwebrtc && hg purge third_party/libwebrtc | ||