944563 - Tracking landings only - Migrate old UI related patches to Holly

Status: RESOLVED FIXED

(Firefox for Metro Graveyard :: General, defect)

Comment 1

[Brian R. Bondy [:bbondy]]

I'm not sure who does the landing from m-c to Holly but this set of patches:
https://tbpl.mozilla.org/?tree=Fx-Team&rev=514b65ab771d

I expect will have some conflicts when landing to Holly.
That's because some of the changes are related to the new UI.

This bug has the extra patches which need to go to Holly. These patches are related to the old UI only.

What I think will happen is that we'll end up with a somewhat not working 'switch to metro/desktop' feature on Holly. And I'll then need to land these patches sooner than later (before v28 uplift) to Holly

Comment 2

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

(In reply to Brian R. Bondy [:bbondy] from comment #1)
> I'm not sure who does the landing from m-c to Holly but this set of patches:
> https://tbpl.mozilla.org/?tree=Fx-Team&rev=514b65ab771d
> 
> I expect will have some conflicts when landing to Holly.
> That's because some of the changes are related to the new UI.
>

Yep, no problem. We've run into that issue a number of times, and the procedure to resolve it is pretty straight-forward.
 
> This bug has the extra patches which need to go to Holly. These patches are
> related to the old UI only.
> 
> What I think will happen is that we'll end up with a somewhat not working
> 'switch to metro/desktop' feature on Holly. And I'll then need to land these
> patches sooner than later (before v28 uplift) to Holly

Are all of the necessary patches ready? Should we attempt the merges / landings now?

Comment 3

[Brian R. Bondy [:bbondy]]

There's 1 patch marked with Holly in each of the dependent bugs. I won't actually be around the whole day though (I'm on PTO), so I can do this myself later. 
I'll also push them to try and test out the build first before doing that.

Comment 4

[Brian R. Bondy [:bbondy]]

Also I have to wait until last night's pushes get on Holly first.

Comment 5

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

Ok, so here's what I'm going to do:

1) I'm going to merge last night's changes into Holly, but back out all of the Australis-related patches before merging
2) I'm *not* going to land the patches that are marked dependent on this bug, to give you a chance to push the patches to try and test them out.

Once you give your greenlight on the patches, somebody can land them on Holly, and we're done.

Does that sound reasonable?

Comment 6

[Brian R. Bondy [:bbondy]]

yep

Comment 7

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

Ok, the merge and backouts are done:

https://hg.mozilla.org/projects/holly/rev/867b227ff548

Comment 8

[Brian R. Bondy [:bbondy]]

Thanks for your help Mike. I'll attach the patches that need to land to this bug and let you know when they're good to land. If you'd prefer that I land them when they are ready directly to Holly that's fine too, just let me know.

Comment 9

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

(In reply to Brian R. Bondy [:bbondy] from comment #8)
> Thanks for your help Mike. I'll attach the patches that need to land to this
> bug and let you know when they're good to land. If you'd prefer that I land
> them when they are ready directly to Holly that's fine too, just let me know.

No problem. I can land them, but if you beat me to it, so be it. :)

Comment 10

[Brian R. Bondy [:bbondy]]

Attachment: 0-bug934032.diff

Comment 11

[Brian R. Bondy [:bbondy]]

Attachment: 1-bug924914.diff

Comment 12

[Brian R. Bondy [:bbondy]]

Attachment: 2-bug928068.diff

Comment 13

[Brian R. Bondy [:bbondy]]

Attachment: 3-bug944434.diff

Comment 14

[Brian R. Bondy [:bbondy]]

https://hg.mozilla.org/projects/holly/rev/4f7211316095
https://hg.mozilla.org/projects/holly/rev/73388ef135b3
https://hg.mozilla.org/projects/holly/rev/7f73c5b97f2c
https://hg.mozilla.org/projects/holly/rev/d991f8fad1c6