Closed Bug 1274650 Opened 4 years ago Closed 4 years ago

merging current m-c to pine

Categories

(Firefox OS Graveyard :: General, defect)

ARM
Gonk (Firefox OS)
defect
Not set
normal

Tracking

(Not tracked)

RESOLVED FIXED

People

(Reporter: gerard-majax, Assigned: gerard-majax)

References

Details

Attachments

(1 file)

No description provided.
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 :)
Flags: needinfo?(fabrice)
Flags: needinfo?(anygregor)
Depends on: 1273947, 1273998, 1270879
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
(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
(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 :/
Ok, that was just my gaia profile that was broken :). I will wait for all tests to finish and push this to pine.
Flags: needinfo?(fabrice)
Flags: needinfo?(anygregor)
Screenshot of Youtube playback on the mulet resulting from the merge :)
Assignee: nobody → lissyx+mozillians
Status: NEW → ASSIGNED
https://hg.mozilla.org/projects/pine/pushloghtml?changeset=fe060e9caf76
Status: ASSIGNED → RESOLVED
Closed: 4 years ago
Resolution: --- → FIXED
You need to log in before you can comment on or make changes to this bug.