1397594 - servo-backout-pr: backout failed - you need to resolve your current index first

Status: RESOLVED FIXED

(Developer Services :: Servo VCS Sync, defect)

Description

[:glob ✱]

processing backout ab26002b1029: Backed out changeset 118a2b0b07c2 for assertion failures
ab26002b1029 backing out 118a2b0b07c2: https://github.com/servo/servo/pull/18399
reverting all local changes and purging /home/servo-sync/backout-autoland
executing: hg --quiet revert --no-backup --all
executing: hg purge --all
$ git fetch https://github.com/servo/servo.git +master:refs/upstream/master
$ git checkout -B gecko-backout
error: you need to resolve your current index first
components/style/gecko/generated/structs_debug.rs: needs merge
components/style/gecko/generated/structs_release.rs: needs merge
failed to create pull-request, retrying: Command '[u'git', u'checkout', u'-B', u'gecko-backout']' returned non-zero exit status 1
processing backout ab26002b1029: Backed out changeset 118a2b0b07c2 for assertion failures

Comment 1

[:glob ✱]

the actual failure:

processing backout ab26002b1029: Backed out changeset 118a2b0b07c2 for assertion failures
ab26002b1029 backing out 118a2b0b07c2: https://github.com/servo/servo/pull/18399
reverting all local changes and purging /home/servo-sync/backout-autoland
executing: hg --quiet revert --no-backup --all
executing: hg purge --all
$ git fetch https://github.com/servo/servo.git +master:refs/upstream/master
From https://github.com/servo/servo
afb874becd..812cac78f0  master     -> refs/upstream/master
$ git checkout -B gecko-backout
Reset branch 'gecko-backout'
$ git clean -d --force
$ git merge refs/upstream/master
Removing tests/wpt/metadata/hr-time/window-worker-time-origin.html.ini
Removing tests/wpt/metadata/hr-time/monotonic-clock.any.js.ini
Removing tests/wpt/metadata/hr-time/basic.any.js.ini
Removing tests/wpt/metadata/custom-elements/attribute-changed-callback.html.ini
Removing tests/wpt/metadata/custom-elements/__dir__.ini
Removing tests/unit/stylo/sanity_checks.rs
Removing tests/unit/style/properties/viewport.rs
Removing tests/unit/gfx/font_cache_thread.rs
Removing rust-commit-hash
Removing components/style_derive/has_viewport_percentage.rs
Auto-merging components/style/properties/gecko.mako.rs
Auto-merging components/style/gecko/generated/structs_release.rs
CONFLICT (content): Merge conflict in components/style/gecko/generated/structs_release.rs
Auto-merging components/style/gecko/generated/structs_debug.rs
CONFLICT (content): Merge conflict in components/style/gecko/generated/structs_debug.rs
Auto-merging components/style/gecko/generated/bindings.rs
Auto-merging components/style/gecko/generated/atom_macro.rs
Automatic merge failed; fix conflicts and then commit the result.
failed to create pull-request, retrying: Command '[u'git', u'merge', u'refs/upstream/master']' returned non-zero exit status 1

Comment 2

[:glob ✱]

looks like we need to `git merge --abort` before `git checkout -B gecko-backout` to reset the state correctly.
errors need to be ignored as this will throw an error if there isn't a merge to abort.

Comment 3

[:glob ✱]

what happen is the _previous_ backout pr failed due to merge conflicts on github.  this required some manual massaging by servo devs as the servo tree was accidentally reopened resulting in a couple of commits landing out of sequence.

the manual fixups resulted in changes to ids in generated code, resulting in them being unable to be merged into the backout pr branch:

> <<<<<<< HEAD
>     fn __bindgen_test_layout_nsTArray_open0__bindgen_ty_id_220510_close0_instantiation() {
> =======
>     fn __bindgen_test_layout_nsTArray_open0__bindgen_ty_id_205354_close0_instantiation() {
> >>>>>>> refs/upstream/master

so even if we abort merges before checking out the gecko-backout branch it'll still fail to merge in changes from master.


to fix this i deleted the gecko-backout branch on servo-vcs-sync; the service automatically created a clean branch and created the PR.

> [servo-sync@servo-vcs-sync ~]$ cd ~/backout-servo
> [servo-sync@servo-vcs-sync backout-servo]$ git branch --delete --force gecko-backout
> Deleted branch gecko-backout (was 3b428fabec).