119
edits
Media/WebRTC/libwebrtc Update Process: Difference between revisions
Media/WebRTC/libwebrtc Update Process (view source)
Revision as of 15:16, 4 April 2023
, 4 April 2023add historical note on why we use a rebase script
(clarify when to use (fix-sha) notation vs (MOZ) notation in commit messages) |
(add historical note on why we use a rebase script) |
||
| Line 31: | Line 31: | ||
=== Daily rebase on elm === | === Daily rebase on elm === | ||
Periodically, ideally daily to minimize surprises from mozilla-central, rebasing elm onto the latest mozilla-central is recommended. Rebases should be completed until the request for merging elm to moz-central is made. | Periodically, ideally daily to minimize surprises from mozilla-central, rebasing elm onto the latest mozilla-central is recommended. Rebases should be completed until the request for merging elm to moz-central is made. | ||
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/elm_rebase.sh | bash dom/media/webrtc/third_party_build/elm/elm_rebase.sh | ||