119
edits
(Added comment about when needing review) |
(remove all the .resume files during restore) |
||
Line 81: | Line 81: | ||
tail -f .moz-fast-forward/logs/log-loop-ff.txt | grep loop-ff | tail -f .moz-fast-forward/logs/log-loop-ff.txt | grep loop-ff | ||
* 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. | ||
rm .moz-fast-forward/ | 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 | ||
./mach python dom/media/webrtc/third_party_build/restore_patch_stack.py --repo-path .moz-fast-forward/moz-libwebrtc | ./mach python dom/media/webrtc/third_party_build/restore_patch_stack.py --repo-path .moz-fast-forward/moz-libwebrtc |
edits