Media/WebRTC/libwebrtc Update Process: Difference between revisions

clarify daily rebases are each business day, and that isn't inflexible
(we no longer need to push the branch to github)
(clarify daily rebases are each business day, and that isn't inflexible)
 
Line 98: Line 98:
== Waiting to land ==
== Waiting to land ==
=== Daily rebase on elm (after completing loop-ff process) ===
=== Daily rebase on elm (after completing loop-ff process) ===
Periodically, ideally daily to minimize surprises from mozilla-central, rebasing elm onto the latest mozilla-central is recommended after completing the update process.  Rebases should be completed until the request for merging elm to moz-central is made.
Periodically, ideally each business day (but even that isn't a hard rule) to minimize surprises from mozilla-central, rebasing elm onto the latest mozilla-central is recommended after completing the update process.  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.
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.
123

edits