1274650 - merging current m-c to pine

Status: RESOLVED FIXED

(Firefox OS Graveyard :: General, defect)

Comment 1

[:gerard-majax]

here is my branch with current m-c being merged on current pine, with conflicts solved: https://github.com/lissyx/mozilla-central/tree/pine_mc_merge_20160520

If any of you could do this on hg pine repo and then push that to try then pine, I would be grateful :)

Comment 2

[:gerard-majax]

Updated my local merge, and applied it to a pine hg clone (using conflicts resolution from git :)), then pushed to try!
https://treeherder.mozilla.org/#/jobs?repo=try&revision=8a1854e04d1f

Comment 3

[:gerard-majax]

(In reply to Alexandre LISSY :gerard-majax from comment #2)
> Updated my local merge, and applied it to a pine hg clone (using conflicts
> resolution from git :)), then pushed to try!
> https://treeherder.mozilla.org/#/jobs?repo=try&revision=8a1854e04d1f

Bogus chrome mochitest manifest, new try: https://treeherder.mozilla.org/#/jobs?repo=try&revision=57275a965fd3

Comment 4

[:gerard-majax]

(In reply to Alexandre LISSY :gerard-majax from comment #3)
> (In reply to Alexandre LISSY :gerard-majax from comment #2)
> > Updated my local merge, and applied it to a pine hg clone (using conflicts
> > resolution from git :)), then pushed to try!
> > https://treeherder.mozilla.org/#/jobs?repo=try&revision=8a1854e04d1f
> 
> Bogus chrome mochitest manifest, new try:
> https://treeherder.mozilla.org/#/jobs?repo=try&revision=57275a965fd3

Reported failures are the same as on previous pine build, this might be good to push to pine. Except locally my mulet is not booting :/

Comment 5

[:gerard-majax]

Ok, that was just my gaia profile that was broken :). I will wait for all tests to finish and push this to pine.

Comment 6

[:gerard-majax]

Attachment: Capture du 2016-05-21 15-53-49.png

Screenshot of Youtube playback on the mulet resulting from the merge :)

Comment 7

[:gerard-majax]

https://hg.mozilla.org/projects/pine/pushloghtml?changeset=fe060e9caf76