tgr@deploy2002:~$ scap backport --revert 1124551 1124867 21:36:41 Checking whether changes are in a branch and version deployed to production... 21:36:42 Reverting 2 change(s) From https://gerrit.wikimedia.org/r/operations/mediawiki-config * branch master -> FETCH_HEAD Branch 'master' set up to track remote branch 'master' from 'origin'. Reset branch 'master' Your branch is up to date with 'origin/master'. Auto-merging wmf-config/InitialiseSettings.php CONFLICT (content): Merge conflict in wmf-config/InitialiseSettings.php error: could not revert 29b665ff3... Turn on Parsoid Read Views for 44 wiktionaries hint: after resolving the conflicts, mark the corrected paths hint: with 'git add <paths>' or 'git rm <paths>' hint: and commit the result with 'git commit' Recorded preimage for 'wmf-config/InitialiseSettings.php' 21:36:42 backport failed: <CalledProcessError> Command '['git', '-C', '/srv/mediawiki-staging', 'revert', '--no-edit', '29b665ff3a4e71b066e95e349d8ac3e9812ca435']' returned non-zero exit status 1. (scap version: 4.139.0)
1124551 is the parent of 1124867, and they overlap in lines touched, not an uncommon situation.
This isn't a huge deal (you can just create revert changesets manually, and deploy those with normal scap backport) but reverting a change is the rare sitation where speed matters, so it would be nice if scap could handle it.