1826015 - elm_rebase.sh bookmarks a non-public commit if MOZ_TOP_FF is a non-public commit

Status: RESOLVED FIXED

(Core :: WebRTC, defect, P2)

Description

[Michael Froman [:mjf]]

Modifications in Bug 1820982 added changed where the bookmark was added to $MOZ_TOP_FF. However, if rebasing non-public commits, adding the bookmark at $MOZ_TOP_FF will inadvertently push non-public commits to the repo when the bookmark is pushed, which not intended behavior. We should bookmark the top public commit (the previous public head of elm) even when rebasing non-public commits.

Comment 1

[BugBot [:suhaib / :marco/ :calixte]]

Set release status flags based on info from the regressing bug 1820982

Comment 2

[Michael Froman [:mjf]]

Attachment: Bug 1826015 - pt1 - only bookmark the last public commit in elm_rebase.sh r?ng!

We don't want to accidentally push non-public commits when pushing
the new bookmark during a rebase.

Depends on D174385

Comment 3

[Michael Froman [:mjf]]

Attachment: Bug 1826015 - pt2 - fix indenting in elm_rebase.sh around resume logic r?dbaker!

Depends on D174386

Comment 4

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/mozilla-central/rev/d36656437fc8
pt1 - only bookmark the last public commit in elm_rebase.sh r=ng
https://hg.mozilla.org/mozilla-central/rev/c35b4a881395
pt2 - fix indenting in elm_rebase.sh around resume logic r=dbaker a=webrtc=merge

Comment 5

[Sebastian Hengst [:aryx] (needinfo me if it's about an intermittent or backout)]

https://hg.mozilla.org/mozilla-central/rev/d36656437fc8
https://hg.mozilla.org/mozilla-central/rev/c35b4a881395

Comment 6

[BugBot [:suhaib / :marco/ :calixte]]

The patch landed in nightly and beta is affected.
:mjf, is this bug important enough to require an uplift?

• If yes, please nominate the patch for beta approval.
• If no, please set status-firefox113 to wontfix.

For more information, please visit auto_nag documentation.

Comment 7

[Michael Froman [:mjf]]

This doesn't apply to beta.