614856 - Get Nova redesign branch into production (when it's done)

Status: RESOLVED FIXED

(www.mozilla.org :: General, defect)

Description

[Steven Garrity [:sgarrity]]

Filing a bug to track sorting out how we'll get the 'nova' redesign branch of mozilla.com into production (when it's ready).

We could merge it into trunk, and then cherry-pick the revision(s) from the merge and push them into stage/production.

I'm open to suggestions. Ideally (and perhaps as a requirement), we should have the site browsable in a post-merge state for at least a few days for testing before launch.

Comment 1

[Steven Garrity [:sgarrity]]

After chatting with Pascal about this, he brought up that a development branch like this should have been receiving updates from trunk on a regular basis.

If I try a merge from trunk into the nova branch, there are "only" about 50 files in conflict - manageable, I think. Does it make sense to merge trunk into nova now, so it's closer come launch time, or will that only complicate things further?

Comment 2

[John Slater]

Alex, what do you think?

Comment 3

[Alex Buchanan [:abuchanan]]

(In reply to comment #0) 
> We could merge it into trunk, and then cherry-pick the revision(s) from the
> merge and push them into stage/production.

That could work.  I'm not sure yet if there's a better option.


> I'm open to suggestions. Ideally (and perhaps as a requirement), we should have
> the site browsable in a post-merge state for at least a few days for testing
> before launch.


Yes, absolutely.  After the mobile/firefox launches next week, I suggest we set up this up as quickly as possible and lock down changes to the website until after launch.

(In reply to comment #1)
> Does it make sense to merge trunk into
> nova now, so it's closer come launch time, or will that only complicate things
> further?

I think merging them now is fine, and could give us a head start on finding issues.  I did this a few times near the beginning of the project, but haven't done it lately.


Our main concern is changes on trunk that aren't ready to be in production.  Since nova is based on trunk (and we'll be merging trunk -> nova), I'm sure there is code on nova that isn't ready for production.  

So, we need to figure out exactly what those changes are and deal with them (get them into production, or move them to a branch/patch and remove them from nova/trunk/stage).  I'm working on figuring out what those changes are.

Comment 4

[Pascal Chevrel:pascalc]

This is blocking me for my l10n work on the nova branch, can you do the merge from trunk asap please? Thanks

Comment 5

[Alex Buchanan [:abuchanan]]

Ok, I've merged trunk -> nova in r78580

I've noticed a few broken things, which I'll work on fixing and/or filing bugs for tomorrow.  I wanted to get this committed so I'm not blocking Pascal.

The inline email form is the biggest broken thing.  You'll notice that on the firstrun page, and the /about/participate/ page.  I'll try to fix this tomorrow.

After that (and likely through the weekend) I'll work on clearing out changes from trunk that aren't on production yet.

Comment 6

[Alex Buchanan [:abuchanan]]

Another merge from trunk -> nova in r79209