Closed Bug 1276659 Opened 8 years ago Closed 8 years ago

merging current m-c (2016-06-22) to pine

Categories

(Firefox OS Graveyard :: General, defect)

Product:
Firefox OS Graveyard
Component:
General
Platform:
ARM
Gonk (Firefox OS)
Type:
defect
Priority:
Not set
Severity:
normal

Tracking

(Not tracked)

Status:
RESOLVED FIXED

People

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

References

Details

Attachments

(1 file)

current merge conflicts
1.19 KB, text/plain
Details 
      No description provided.
Assignee: nobody → lissyx+mozillians
Depends on: 1275299
device build works (with the expected hacks for debug build)
we really need a good fix for bug 1275531 though :/
Summary: merging current m-c (2016-05-30) to pine → merging current m-c (2016-06-02) to pine
(In reply to Alexandre LISSY :gerard-majax from comment #5)
> https://treeherder.mozilla.org/#/jobs?repo=try&revision=8c8858075011

I broke the build when merging :), new try: https://treeherder.mozilla.org/#/jobs?repo=try&revision=f2d929b3b687
Depends on: 1276927
Bug 1276927 has been fixed. Let's do the final merger from m-c to pine and back to m-c.
Summary: merging current m-c (2016-06-02) to pine → merging current m-c (2016-06-22) to pine

    
    

    
  
Alex, you might want to wait for the fix to bug 1281169.

    
    

    
  
basic mulet is working for me, testing for devices now

    
    

    
  
updated merge with current m-c that includes fix for bug 1281139

    
    

    
  
borken xpcshell test because zip file changed and I missed the changes during merge: https://treeherder.mozilla.org/#/jobs?repo=try&revision=ef5d8800a7a0&selectedJob=22729279

    
    

    
  
(In reply to Alexandre LISSY :gerard-majax from comment #11)
> basic mulet is working for me, testing for devices now

z3c kk works good enough for me

    
    

    
  
(In reply to Alexandre LISSY :gerard-majax from comment #17)
> https://treeherder.mozilla.org/#/jobs?repo=try&revision=ae60b892a69c

that was not enough

    
    

    
  
Also no explicit breakage on Project Tablet, good to merge.

    
    

    
  
https://hg.mozilla.org/projects/pine/pushloghtml?changeset=affbcb3c2e6b
Status: NEW → RESOLVED
Closed: 8 years ago
Resolution: --- → FIXED

          You need to log in
          before you can comment on or make changes to this bug.
        






  

    
  







  

    

      
Attachment

      

      
      
      
      
    

    

      

        

          

            
General

            

              Creator: 



            

            
Created: 

            
Updated: 

            
Size: