Closed Bug 1794469 Opened 2 years ago Closed 2 years ago

Add scripts to deal with upstream revert commits more gracefully

Categories

(Core :: WebRTC, task, P2)

task

Tracking

()

RESOLVED FIXED

People

(Reporter: mjf, Assigned: mjf)

References

Details

Attachments

(3 files)

Upstream libwebrtc commits that are reverted frequently cause merge conflicts with our patch stack on github. If there was a conflict on the original landing, there will be an additional merge conflict on the revert commit as well when the change is eventually relanded. This cycle occasionally happens several times. We should teach our fast-forward scripts to deal with this to push the merge conflict to the final reland commit.

Assignee: nobody → mfroman
Blocks: 1790097
Severity: -- → S3
Priority: -- → P2
Status: NEW → RESOLVED
Closed: 2 years ago
Resolution: --- → FIXED
Pushed by archaeopteryx@coole-files.de: https://hg.mozilla.org/mozilla-central/rev/6fa41ab723c8 pt0 - squelch noisy output from hg revert command in verify_vendoring.sh r=ng https://hg.mozilla.org/mozilla-central/rev/8bfbef09abe6 pt1 - new scripts to detect and remedy upstream revert commits. r=ng https://hg.mozilla.org/mozilla-central/rev/a1c184befef8 pt2 - hookup new revert/no-op scripts to loop-ff.sh and fast-forward-libwebrtc.sh r=ng
You need to log in before you can comment on or make changes to this bug.

Attachment

General

Created:
Updated:
Size: