119
edits
Media/WebRTC/libwebrtc Update Process: Difference between revisions
Jump to navigation
Jump to search
Media/WebRTC/libwebrtc Update Process (view source)
Revision as of 18:46, 20 March 2024
, 20 March 2024add note about ability to stop during the rebase operation
(add a note that all commands assume bash shell) |
(add note about ability to stop during the rebase operation) |
||
| Line 102: | Line 102: | ||
Historical note: we use a script to rebase because 1) it regenerates the moz.build files on the commits where those are changed. This avoids the typically massive rebase conflict if anyone has touched the build files. 2) it exports/imports each commit individually to limit rebase conflicts on individual patches, making it easier to deal with issues. | Historical note: we use a script to rebase because 1) it regenerates the moz.build files on the commits where those are changed. This avoids the typically massive rebase conflict if anyone has touched the build files. 2) it exports/imports each commit individually to limit rebase conflicts on individual patches, making it easier to deal with issues. | ||
bash dom/media/webrtc/third_party_build/elm_rebase.sh | bash dom/media/webrtc/third_party_build/elm_rebase.sh | ||
If one would like to make changes to the patch ordering during the rebase operation (say, for example, a fix-commit was necessary but is separated from the initial upstream patch), use the following command line: | |||
STOP_FOR_REORDER=1 bash dom/media/webrtc/third_party_build/elm_rebase.sh | |||
=== Requesting merge from elm to mozilla-central === | === Requesting merge from elm to mozilla-central === | ||