Media/WebRTC/libwebrtc Update Process: Difference between revisions

add tip on dealing with complicated rebases
(remove superfluous period in after step 6)
(add tip on dealing with complicated rebases)
Line 35: Line 35:
- While loop-ff.sh is running, in a separate terminal window it may be helpful to see the overall progress by running:
- While loop-ff.sh is running, in a separate terminal window it may be helpful to see the overall progress by running:
  tail -f ~/log-loop-ff.txt | grep loop-ff
  tail -f ~/log-loop-ff.txt | grep loop-ff
- If a particularly complicated rebase conflict is encountered, it is helpful to tar up the moz-libwebrtc directory to allow a complete reset without losing current progress.
(cd {path-to}/moz-central && rm log_resume.txt) # resets the resume logic in loop-ff.sh
(cd {path-to}/moz-libwebrtc && git rebase --abort) # don't finish this rebase
(cd {path-to}/moz-libwebrtc/.. && tar czf moz-libwebrtc.tar.gz && cd moz-libwebrtc)


== Resetting Elm ==
== Resetting Elm ==
119

edits