527720 - [FyFx] Set up a production branch

Status: RESOLVED FIXED

(Webtools Graveyard :: Five Years of Firefox, defect)

Description

[Staś Małolepszy :stas]

Right now the production server checks the code out from fyfx/trunk (as per bug 527148 comment 15). I'd like to set up a production branch from which we will serve the code on production (the stage will continue to svn up from trunk).

Localizers still continue to fix their translations and I'd like to be able to update the production server.

In the same time, we're working on bug 527030. Some changes for it already landed, but we're not ready yet. See http://fyfx.stage.mozilla.com/zh-CN/ - the wishes links point to t.sine.com.cn and douban.com, but the translation still mentions Twitter and Facebook.

If I ask the IT now to update the production server for l10n fixes localizers checked in today, we'll update the zh-CN version as well, and right not it's not ready to go live.

Therefore, I'd like to create a production branch for changes that have been tested on stage and are ready to go live.

Comment 1

[Staś Małolepszy :stas]

I created the branch in r55836. 

I started with r55680, then merged all subsequent revisions except those from bug 527030 (zh-CN fixes, not ready yet).

Comment 2

[Staś Małolepszy :stas]

The branch URL is: http://svn.mozilla.org/projects/fyfx/branches/production

Comment 3

[Michael Morgan [:morgamic]]

Branch looks good, resolving.  IT update is covered in bug 527721.

Comment 4

[Staś Małolepszy :stas]

Just for the record, here's what I did:

$ svn copy trunk@55680 branches/production
$ cd branches/production
$ svn merge -c 55694 ../../trunk/
$ mate css/fyfx.css 
$ svn merge -c 55696 ../../trunk/
$ svn merge -c 55698 ../../trunk/
$ svn merge -c 55710 ../../trunk/
$ svn merge -c 55734 ../../trunk/
$ svn merge -r 55734:55820 ../../trunk/

Comment 5

[Staś Małolepszy :stas]

Attachment: Result of `diff -U8 trunk/ branches/production/` as of r55860

Again, for the record, here's a diff between trunk and the production branch as of r55860.