1632986 - Make shipped-locales on comm-central match what's really shipped

Status: RESOLVED FIXED

(Thunderbird :: Build Config, enhancement)

Description

[Rob Lemley [:rjl]]

On comm-central, comm/mail/shipped-locales contains only "en-US". The reason's for that are not completely clear to me, but it's causing fun problems.

The shipped-locales file is what the l10n repack jobs use on release branches to determine which translations should get built. Daily builds refer to all-locales in the same directory. Maybe at some time in the past shipped-locales on comm-central was used by something, but today that is not the case.

The fun problems start on merge day, when our merge scripts will merge the comm-central version of shipped-locales to comm-beta, then effectively back out the change it made in a subsequent commit.

The new merge day process (bug 1619767) don't support that trample and backout scenario. Looking at what Firefox is doing, browser/shipped-locales on mozilla-central lines up with what gets shipped later down the the line starting with Beta.

Two tasks here:

• Copy mail/locales/shipped-locales from comm-beta and update comm-central
• Remove the restoration code from the current merge scripts

Comment 1

[Rob Lemley [:rjl]]

Attachment: shipped-locales on c-c should match what is shipped at release time

Comment 2

[Rob Lemley [:rjl]]

Attachment: [merge-scripts] Remove code that handles shipped-locales files

The current merge scripts are not ready to replace quite yet.
The other changes in this bug make this dance with shipped-locales
unnecessary.
The calendar shipped-locales file does not require changes in comm-central
so that's why there is no update for it as is the case for mail.

Comment 3

[Magnus Melin [:mkmelin]]

Comment on attachment 9143222 [details] [diff] [review]
shipped-locales on c-c should match what is shipped at release time

Review of attachment 9143222 [details] [diff] [review]:
-----------------------------------------------------------------

Looks good, r=mkmelin

Comment 4

[Rob Lemley [:rjl]]

For comm-central checkin, use attachment 9143222 [details] [diff] [review].

Comment 5

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/comm-central/rev/3b6f520b9791
shipped-locales on c-c should match what is shipped at release time. r=mkmelin

Comment 6

[Patrick Cloke [:clokep]]

Comment on attachment 9143225 [details] [diff] [review]
[merge-scripts] Remove code that handles shipped-locales files

Review of attachment 9143225 [details] [diff] [review]:
-----------------------------------------------------------------

I think this is just a remnant of how we've "always" done things. Thanks for cleaning this up!

Comment 7

[Patrick Cloke [:clokep]]

(In reply to Patrick Cloke [:clokep] from comment #6)

Comment on attachment 9143225 [details] [diff] [review]
[merge-scripts] Remove code that handles shipped-locales files

Review of attachment 9143225 [details] [diff] [review]:

I think this is just a remnant of how we've "always" done things. Thanks for
cleaning this up!

I landed this as https://hg.mozilla.org/users/bugzilla_standard8.plus.com/drivertools/rev/fcc050f268fce522fa5373c2322060eee502efc4