Media/WebRTC/libwebrtc Update Process: Difference between revisions

Media/WebRTC/libwebrtc Update Process (view source)

678 bytes removed , 13 March 2023

Remove manual instructions to rebase floating patches (the arcconfig patch really)

7

edits

@@ Line 70: / Line 70: @@
 == Resetting Elm ==
-Before each new merge cycle. Elm needs to be reset to Central, and the floating patches need to be reapplied.
+Before each new merge cycle. Elm needs to be reset to Central.
 # Ensure you have filed a bug for the next merge cycle, and further ensure that the next merge cycle bug has the previous merge cycle bug as a dependency.
 # Make sure you have a local checkout of Elm which includes the floating patches.
 # File a bug as a clone of [https://bugzilla.mozilla.org/show_bug.cgi?id=1789675 Bug 1789675] and add your new bug as dependency to the next merge cycle bug.
 # Wait for the repo admins to reset the repository.
-# Mark the floating arc config patch with a bookmark. If the patch had id `5e8481a558fb` then one would run <syntaxhighlight lang="Bash">hg bookmark -r 5e8481a558fb ARC_CONFIG_FLOAT</syntaxhighlight>
-# Pull the new head of Elm. <syntaxhighlight lang="Bash">hg pull</syntaxhighlight>
-# Rebase the floating patches onto the new checkout of Elm, then checkout the new tip. <syntaxhighlight lang="Bash">
-hg rebase --keep -s ARC_CONFIG_FLOAT -d elm && \
-hg co tip && \
-hg bookmark ARC_CONFIG_FLOAT
-</syntaxhighlight>
-# Push the floating patches to Elm. <syntaxhighlight lang="Bash">hg push --bookmark=ARC_CONFIG_FLOAT</syntaxhighlight>
 # Celebrate