592127 - Restore channel-prefs.js in nightly updates for a few days

Status: RESOLVED FIXED

(Firefox Build System :: General, defect)

Description

[Michael Wu [:mwu]]

Attachment: Add channel-prefs.js back to the update temporarily

We deleted channel-prefs.js during the omnijar update but now we want it back. Patch reviewed by nthomas in bug 591866.

Comment 1

[Michael Wu [:mwu]]

We'll want to land this before the nightly builds tonight.

Comment 2

[Mike Beltzner [:beltzner, not reading bugmail]]

Comment on attachment 470626 [details] [diff] [review]
Add channel-prefs.js back to the update temporarily

a=beltzner, with special dispensation to land tonight. Doesn't look like we'll get to tagging for b5. I've filed bug 592164 to track the fact that now we need to back this out before building b5.

Comment 3

[Michael Wu [:mwu]]

http://hg.mozilla.org/mozilla-central/rev/6476d13bec49

Will leave this bug open until we back it out again, unless a new bug for backing this out is preferred.

Comment 4

[Dão Gottwald [:dao]]

(In reply to comment #3)
> http://hg.mozilla.org/mozilla-central/rev/6476d13bec49
> 
> Will leave this bug open until we back it out again, unless a new bug for
> backing this out is preferred.

bug 592164?

Comment 5

[Kyle Huey (Exited; not receiving bugmail, old account, do not use)]

Backed out for tagging the relbranch, then relanded as http://hg.mozilla.org/mozilla-central/rev/2b912044dfe7

Leaving this open until we back this out for good.

Comment 6

[Michael Wu [:mwu]]

Looks like this had the intended effect, as I now have channel-prefs.js in my osx minefield. I'm planning on backing this out Monday, unless people prefer having this backed out earlier or later. I figure that we should have most of our nightly users covered if we get most weekdays and a weekend in.

Comment 7

[Michael Wu [:mwu]]

dougt backed this out for me.

http://hg.mozilla.org/mozilla-central/rev/15d001b10603