Bug 1554851 Comment 13 Edit History

Note: The actual edited comment in the bug view page will always show the original commenter’s name and original timestamp.

Original comment by
on 
(In reply to Julien Cristau [:jcristau] from comment #11)
> $ hg graft -e -r 2ff50159f61f
> grafting 532557:2ff50159f61f "Bug 1554851 - Let ARM64 Fennec 68 reach the release population r=mhentges"
> merging taskcluster/taskgraph/loader/push_apk.py
> merging taskcluster/taskgraph/transforms/push_apk.py                                                                                                                                                               
> warning: conflicts while merging taskcluster/taskgraph/loader/push_apk.py! (edit, then use 'hg resolve --mark')                                                                                                    
> warning: conflicts while merging taskcluster/taskgraph/transforms/push_apk.py! (edit, then use 'hg resolve --mark')                                                                                                
> abort: unresolved conflicts, can't continue
> (use 'hg resolve' and 'hg graft --continue')

Sorry, I landed the patch before notificing your NI. The rebased patch is https://bugzilla.mozilla.org/attachment.cgi?id=9069341. It's the one I landed in comment 3.
Revision 1 by
on 
(In reply to Julien Cristau [:jcristau] from comment #11)
> $ hg graft -e -r 2ff50159f61f
> grafting 532557:2ff50159f61f "Bug 1554851 - Let ARM64 Fennec 68 reach the release population r=mhentges"
> merging taskcluster/taskgraph/loader/push_apk.py
> merging taskcluster/taskgraph/transforms/push_apk.py                                                                                                                                                               
> warning: conflicts while merging taskcluster/taskgraph/loader/push_apk.py! (edit, then use 'hg resolve --mark')                                                                                                    
> warning: conflicts while merging taskcluster/taskgraph/transforms/push_apk.py! (edit, then use 'hg resolve --mark')                                                                                                
> abort: unresolved conflicts, can't continue
> (use 'hg resolve' and 'hg graft --continue')

Sorry, I landed the patch before notificing your NI. The rebased patch is https://bugzilla.mozilla.org/attachment.cgi?id=9069341. It's the one I landed in comment 12.
Revision 2 by
on 
(In reply to Julien Cristau [:jcristau] from comment #11)
> $ hg graft -e -r 2ff50159f61f
> grafting 532557:2ff50159f61f "Bug 1554851 - Let ARM64 Fennec 68 reach the release population r=mhentges"
> merging taskcluster/taskgraph/loader/push_apk.py
> merging taskcluster/taskgraph/transforms/push_apk.py                                                                                                                                                               
> warning: conflicts while merging taskcluster/taskgraph/loader/push_apk.py! (edit, then use 'hg resolve --mark')                                                                                                    
> warning: conflicts while merging taskcluster/taskgraph/transforms/push_apk.py! (edit, then use 'hg resolve --mark')                                                                                                
> abort: unresolved conflicts, can't continue
> (use 'hg resolve' and 'hg graft --continue')

Sorry, I landed the patch before notificing your NI. The rebased patch is attachment 9069341 [details]. It's the one I landed in comment 12.

Back to Bug 1554851 Comment 13