Closed Bug 1042108 Opened 5 years ago Closed 2 years ago

Tracking: mozilla-central repo merges to metro project repo

Categories

(Firefox for Metro Graveyard :: General, defect)

x86_64
All
defect
Not set

Tracking

(Not tracked)

RESOLVED INCOMPLETE

People

(Reporter: jimm, Assigned: jimm)

References

Details

tracking bug for tracking when we merge or need to merge mc over to metro. Also for general merge discussion.
last merge was 2014-06-24, I'll do another merge today.
I can't currently push the merge, there's something broken with main thread detection. Will try to get back to this later today.
At least, we need to merge changes from bug 976963
Depends on: 1042708
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
Depends on: 1042734
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.
(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.
Depends on: 1036985
Depends on: 1045727
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
Depends on: 1071568
Depends on: 1059626
Depends on: 1073563
Depends on: 1078327
Depends on: 1080388
Depends on: 1080361
Depends on: 1080360
Depends on: 1084323
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.
(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.
> 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.
(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
Depends on: 1088084
Depends on: 1088802
Depends on: 1090273
Project/metro branch was synchronized from m-c at 28th of October.
https://hg.mozilla.org/projects/metro/pushloghtml?changeset=478f5dc91b6f
Depends on: 1090902
Depends on: 1092128
Depends on: 1092129
Depends on: 1092131
Depends on: 1092133
Depends on: 1092135
Depends on: 1092137
Depends on: 1092141
Depends on: 1094913
Depends on: 1098139
Depends on: 1100847
Depends on: 1100984
Mass close of bugs in obsolete product https://bugzilla.mozilla.org/show_bug.cgi?id=1350354
Status: NEW → RESOLVED
Closed: 2 years ago
Resolution: --- → INCOMPLETE
You need to log in before you can comment on or make changes to this bug.