1332125 - autoland request has been lost in the ether

Status: RESOLVED DUPLICATE of bug 1332127

(Conduit Graveyard :: Transplant, defect)

Description

[Dana Keeler (she/her) [:keeler]]

I tried to land https://reviewboard.mozilla.org/r/104270/ using autoland. It's been a few hours now, and while the tree is open (other things have landed using autoland), my request still hasn't gone through. (Neither has it failed - reviewboard still says "Waiting for the Autoland request to execute on autoland, hold tight").

Comment 1

[:glob ✱]

the landing failed:

21:27:31,321 autoland INFO transplant failed - manual rebase required: tree: gecko rev: 9339e7dc8d197cbcc373baaf62a51657fe52e37e destination: ssh://hg.mozilla.org/integration/autoland error: hg error in cmd: hg rebase -s 051307542872 -d 05ba56765a31: rebasing 361775:051307542872 "bug 1328718 - implement system add-on to facilitate rollout of disabling SHA-1 r=Felipe,jcj data-review=bsmedberg" (tip)
merging browser/extensions/e10srollout/bootstrap.js and browser/extensions/disableSHA1rollout/bootstrap.js to browser/extensions/disableSHA1rollout/bootstrap.js
merging browser/extensions/e10srollout/install.rdf.in and browser/extensions/disableSHA1rollout/install.rdf.in to browser/extensions/disableSHA1rollout/install.rdf.in
merging browser/extensions/moz.build
warning: conflicts while merging browser/extensions/disableSHA1rollout/bootstrap.js! (edit, then use 'hg resolve --mark')
warning: conflicts while merging browser/extensions/disableSHA1rollout/install.rdf.in! (edit, then use 'hg resolve --mark')
unresolved conflicts (see hg resolve, then hg rebase --continue)

so this is really bug 1332127.