865419 - Fix bad 3-way merge into UX branch

Status: RESOLVED FIXED

(Firefox :: General, defect)

Description

[Mike Conley (:mconley) (:⚙️)]

Today, I merged mozilla-central into UX.

The good news: it mostly went well!

The bad news: it didn't all go well. In particular, the changes from bug 748894 had to be resolved manually, and I didn't do a good enough job. The merge I did ended up breaking browser.xul with invalid XML.

We need to fix this stat, and merge it into Jamun because I was too overzealous and merged it into jamun before I figured out this breakage.

Comment 1

[Mike Conley (:mconley) (:⚙️)]

Attachment: Patch v1

This fixes everything.

Comment 2

[Dão Gottwald [:dao]]

Comment on attachment 741476 [details] [diff] [review]
Patch v1

indentation is off

Comment 3

[Dão Gottwald [:dao]]

(In reply to Dão Gottwald [:dao] from comment #2)
> Comment on attachment 741476 [details] [diff] [review]
> Patch v1
> 
> indentation is off

No, it isn't! I read this wrongly.

Comment 4

[Mike Conley (:mconley) (:⚙️)]

Fixed in UX as https://hg.mozilla.org/projects/ux/rev/fd26cf8fc03a

and merged into Jamun as https://hg.mozilla.org/projects/jamun/rev/fd26cf8fc03a

Comment 5

[Mike Conley (:mconley) (:⚙️)]

More bad news - there was one more fragment lost in the merge:

We're calling BookmarksMenuButton.updateStarState(); in browser-customization.js, but this was changed to BookmarksMenuButton.updateStarState(); on mozilla-central.

This means that exiting customization mode is failing (this is why tabs aren't going back into the titlebar in maximized mode, and the customization button is still disabled after exiting).

Comment 6

[Mike Conley (:mconley) (:⚙️)]

Attachment: Follow-up

This fixes broken-ness after exiting customization mode.

Comment 7

[Mike Conley (:mconley) (:⚙️)]

Thanks for all the reviews today, Jared.

Landed on UX as https://hg.mozilla.org/projects/ux/rev/d352115aef51

Landed on Jamun as https://hg.mozilla.org/projects/jamun/rev/d352115aef51

Comment 8

[:Gijs (he/him)]

https://hg.mozilla.org/mozilla-central/rev/fd26cf8fc03a
https://hg.mozilla.org/mozilla-central/rev/d352115aef51