139
edits
(better notes on handling a botched rebase conflict and using restore_patch_stack.py) |
(Move elm reset instructions up to top of page) |
||
Line 8: | Line 8: | ||
* Starting with a fresh clone of elm is recommended for each new chromium milestone. | * Starting with a fresh clone of elm is recommended for each new chromium milestone. | ||
hg clone --stream ssh://hg.mozilla.org/projects/elm | hg clone --stream ssh://hg.mozilla.org/projects/elm | ||
== Resetting Elm == | |||
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. | |||
# File a bug as a clone of [https://bugzilla.mozilla.org/show_bug.cgi?id=1822294 Bug 1822294] and add your new bug as dependency to the next merge cycle bug. | |||
# Wait for the repo admins to reset the repository. | |||
# Make sure to land the updated [[Media/WebRTC/libwebrtc_Update_Process#Post-merge Steps|update_example_config.sh]] | |||
# Celebrate | |||
=== Update steps === | === Update steps === | ||
Line 78: | Line 86: | ||
* Stopping the loop-ff.sh manually is best done when in the <code>Test build</code> phase using Ctrl-c. | * Stopping the loop-ff.sh manually is best done when in the <code>Test build</code> phase using Ctrl-c. | ||
* [[libwebrtc GYP generated Java files|GYP generated Java files]] | * [[libwebrtc GYP generated Java files|GYP generated Java files]] | ||
edits