24
edits
(Break out Reacting to loop-ff.sh section to highlight the three types of failures to deal with) |
(Clarify extract-for-git.py some more) |
||
Line 88: | Line 88: | ||
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 | ||
* [[libwebrtc GYP generated Java files|GYP generated Java files]] | * [[libwebrtc GYP generated Java files|GYP generated Java files]] | ||
* If | * If instructed to run [https://searchfox.org/mozilla-central/rev/3b707c8fd7e978eebf24279ee51ccf07895cfbcb/dom/media/webrtc/third_party_build/extract-for-git.py#9-12 extract-for-git.py], note that <code>loop-ff.sh</code> has more context than <code>verify_vendoring.sh</code> and offers information that is relevant: Specifically, the tip about <code>tip::tip</code>: | ||
If you have previously run loop-ff.sh successfully, there may be a new | If you have previously run loop-ff.sh successfully, there may be a new | ||
change to third_party/libwebrtc that should be extracted and added to | change to third_party/libwebrtc that should be extracted and added to | ||
Line 97: | Line 97: | ||
git am mailbox.patch) | git am mailbox.patch) | ||
* | * Replace <code>tip</code> here with your (fix-xxx) mercurial patch, if it is not at tip (e.g. if it is followed by (fix-xxx) - moz.build file updates). | ||
=== Backing out === | === Backing out === |
edits