Closed Bug 1264962 Opened 8 years ago Closed 6 years ago

Couldn't autoland https://reviewboard.mozilla.org/r/45851/ - We're sorry - something has gone wrong while rewriting or rebasing your commits. The commits being pushed no longer match what was requested.

Categories

(Conduit Graveyard :: Transplant, defect)

defect
Not set
normal

Tracking

(Not tracked)

RESOLVED WONTFIX

People

(Reporter: Gijs, Unassigned)

Details

I tried to use autoland on https://reviewboard.mozilla.org/r/45851/

after a while, I refreshed the page and it said:

 We're sorry - something has gone wrong while rewriting or rebasing your commits. The commits being pushed no longer match what was requested. Please file a bug. 

I'm not really sure why - I tried rebasing the (fx-team-based) patch set onto inbound on a separate machine, pulling the commits down from mozreview first, and that worked fine.
gijs-mbp:multitree gkruitbosch$ hg pull -r 85d97896f27e  gecko-review
pulling from https://reviewboard-hg.mozilla.org/gecko
searching for changes
adding changesets
adding manifests
adding file changes
added 5 changesets with 37 changes to 35 files (+1 heads)
(run 'hg heads .' to see heads, 'hg merge' to merge)
gijs-mbp:multitree gkruitbosch$ hg wip
o   293238 gijskruitbosch tip
|  Bug 1236991 - bonus: move all the tests into the component dir instead of cluttering up browser/.../tests/general, r?enndeakin
o   293237 gijskruitbosch
|  Bug 1236991 - part 4: fix the tests to run in e10s mode, r?enndeakin
o   293236 gijskruitbosch
|  Bug 1236991 - part 3: allow use of todo() from ContentTask, r=mconley
o   293235 gijskruitbosch
|  Bug 1236991 - part 2: implement a default tooltiptextprovider in toolkit, r?enndeakin
o   293234 gijskruitbosch
|  Bug 1236991 - part 1: allow forwarding label direction through nsITooltipTextProvider, r?enndeakin
| @   293233 gijskruitbosch
| |  <censor>
| o   293232 gijskruitbosch
| |  <censor>
| o   293230 gijskruitbosch
|/   Backed out changeset c344a216f1d8 (bug 1261068)
o   293225 mdeboer
|  Bug 1261584: follow-up to add a missing comment. r=me. DONTBUILD.
| o   292576 gijskruitbosch
|/   Bug 1249362 - correct content principal when about:blank loads stop, r?mconley
o     292572 cbook
|\   Merge mozilla-central to fx-team
gijs-mbp:multitree gkruitbosch$ hg up -r fx-team
15 files updated, 0 files merged, 2 files removed, 0 files unresolved
gijs-mbp:multitree gkruitbosch$ hg pull inbound
pulling from inbound
searching for changes
adding changesets
adding manifests
adding file changes                                                                                                                                                                                                  
added 201 changesets with 638 changes to 489 files (+1 heads)
added 75183 pushes
(run 'hg heads .' to see heads, 'hg merge' to merge)
gijs-mbp:multitree gkruitbosch$ hg wip
o     293439 ahalberstadt tip
|\   Bug 1255565 - Close extraneous browser window when running reftests, r=dholbert
| | o   293238 gijskruitbosch
| | |  Bug 1236991 - bonus: move all the tests into the component dir instead of cluttering up browser/.../tests/general, r?enndeakin
| | o   293237 gijskruitbosch
| | |  Bug 1236991 - part 4: fix the tests to run in e10s mode, r?enndeakin
| | o   293236 gijskruitbosch
| | |  Bug 1236991 - part 3: allow use of todo() from ContentTask, r=mconley
| | o   293235 gijskruitbosch
| | |  Bug 1236991 - part 2: implement a default tooltiptextprovider in toolkit, r?enndeakin
| | o   293234 gijskruitbosch
| | |  Bug 1236991 - part 1: allow forwarding label direction through nsITooltipTextProvider, r?enndeakin
| | | o   293233 gijskruitbosch
| | | |  <censor>
| +---o   293232 gijskruitbosch
| | |    <censor>
| @ |   293230 gijskruitbosch
| |/   Backed out changeset c344a216f1d8 (bug 1261068)
| o   293225 mdeboer
|/   Bug 1261584: follow-up to add a missing comment. r=me. DONTBUILD.
| o   292576 gijskruitbosch
|/   Bug 1249362 - correct content principal when about:blank loads stop, r?mconley
o     292572 cbook
|\   Merge mozilla-central to fx-team
gijs-mbp:multitree gkruitbosch$ hg rebase -b 293238 --keep -d inbound
rebasing 293234:3837d6744a10 "Bug 1236991 - part 1: allow forwarding label direction through nsITooltipTextProvider, r?enndeakin"
merging browser/base/content/browser.js
rebasing 293235:9d65d38845b3 "Bug 1236991 - part 2: implement a default tooltiptextprovider in toolkit, r?enndeakin"
rebasing 293236:dbef335e6251 "Bug 1236991 - part 3: allow use of todo() from ContentTask, r=mconley"                                                                                                                 
rebasing 293237:7ea1ad32be28 "Bug 1236991 - part 4: fix the tests to run in e10s mode, r?enndeakin"                                                                                                                  
rebasing 293238:85d97896f27e "Bug 1236991 - bonus: move all the tests into the component dir instead of cluttering up browser/.../tests/general, r?enndeakin"
Product: MozReview → Conduit
MozReview is going to be decommissioned.
Status: NEW → RESOLVED
Closed: 6 years ago
Resolution: --- → WONTFIX
Product: Conduit → Conduit Graveyard
You need to log in before you can comment on or make changes to this bug.