1042108 - Tracking: mozilla-central repo merges to metro project repo

Status: RESOLVED INCOMPLETE

(Firefox for Metro Graveyard :: General, defect)

Description

[Jim Mathies [:jimm]]

tracking bug for tracking when we merge or need to merge mc over to metro. Also for general merge discussion.

Comment 1

[Jim Mathies [:jimm]]

last merge was 2014-06-24, I'll do another merge today.

Comment 2

[Jim Mathies [:jimm]]

I can't currently push the merge, there's something broken with main thread detection. Will try to get back to this later today.

Comment 3

[Maksim Lebedev]

At least, we need to merge changes from bug 976963

Comment 4

[Jim Mathies [:jimm]]

http://hg.mozilla.org/projects/metro/rev/0501e299b7aa

Comment 5

[Jim Mathies [:jimm]]

Generally this is pretty easy to do - 

cd metro
hg pull http://hg.mozilla.org/mozilla-central
hg merge
(address any conflicts)
hg commit -m "merge mc to metro"
(build and test)
hg push

Comment 6

[Maksim Lebedev]

I am doubt by changes for example by bug 1033358 and related with it.
Looks like, if changes with assertions
> MOZ_ASSERT(NS_IsMainThread())
come to project/metro - it will be very bad.
At least MetroFF in m-c now doesn't work by this reason.

Comment 7

[Jim Mathies [:jimm]]

(In reply to Maksim Lebedev from comment #6)
> I am doubt by changes for example by bug 1033358 and related with it.
> Looks like, if changes with assertions
> > MOZ_ASSERT(NS_IsMainThread())
> come to project/metro - it will be very bad.
> At least MetroFF in m-c now doesn't work by this reason.

I just landed a fix for this in bug 1042708.

Comment 8

[Kartikaya Gupta (email:[e-mail])]

I did another merge to pick up the recent fixes that landed in m-c (bug 1043644, bug 1042734, bug 1043608). Local testing of the merge seemed to behave as expected.

http://hg.mozilla.org/projects/metro/rev/a0c4b5699e7e

Comment 9

[Kartikaya Gupta (email:[e-mail])]

And another merge to pick up the patches from bug 1036985.

http://hg.mozilla.org/projects/metro/rev/74f31dec75b1

Comment 10

[Jim Mathies [:jimm]]

uplifting some older stuff to mc:

Bug 1059626 - Fix mozilla-central build bustage for metro's ceh binary. r=alessarik
Bug 1011685 - Call ipc InitUIThread from MetroAppShell Init. Follow up for 1009590. r=me
Bug 1042708 - Fix improper metro main thread identification. Regression from 1033358. r=me 

https://treeherder.mozilla.org/ui/#/jobs?repo=try&revision=64845aa387a6

After these merge I think we can do a an mc => metro merge finally. We still need a fix for bug 1080388 though to get builds going.

Comment 11

[Maksim Lebedev]

(In reply to Jim Mathies [:jimm] from comment #10)
> After these merge I think we can do a an mc => metro merge finally. We still
> need a fix for bug 1080388 though to get builds going.
Before this synchronizing, I would like to wait at least landing bugs: Bug 1078327 and Bug 1080360.
And if I can get good working metro FireFox in m-c - it will be good.

Comment 12

[Jim Mathies [:jimm]]

> Bug 1059626 - Fix mozilla-central build bustage for metro's ceh binary.
> r=alessarik
> Bug 1011685 - Call ipc InitUIThread from MetroAppShell Init. Follow up for
> 1009590. r=me
> Bug 1042708 - Fix improper metro main thread identification. Regression from
> 1033358. r=me 

https://treeherder.mozilla.org/ui/#/jobs?repo=mozilla-inbound&revision=99e0716c5d66

(In reply to Maksim Lebedev from comment #11)
> Before this synchronizing, I would like to wait at least landing bugs: Bug
> 1078327 and Bug 1080360.

Looks like bug 1078327 landed on mc. We can merge again when bug 1080360 lands.

Comment 13

[Maksim Lebedev]

(In reply to Jim Mathies [:jimm] from comment #12)
> Looks like bug 1078327 landed on mc. We can merge again when bug 1080360 lands.
I hope that this bug will be landed in one or two days.
But I still think that the main things needed for syncronizing is to get correct metro build on m-c

Comment 14

[Maksim Lebedev]

Project/metro branch was synchronized from m-c at 28th of October.
https://hg.mozilla.org/projects/metro/pushloghtml?changeset=478f5dc91b6f

Comment 15

[Maksim Lebedev]

Some bugs (Bug 1073563, Bug 1094913, Bug 1098139) were syncronizing from m-c into projects/metro.
https://hg.mozilla.org/projects/metro/pushloghtml?changeset=e6eb970ca7a4

Comment 16

[Firefox Bug Husbandry Bot]

Mass close of bugs in obsolete product https://bugzilla.mozilla.org/show_bug.cgi?id=1350354