Fix a problem with the branch rewrite script that prevented it working when the branch deletes files. Whenever there are deleted files, manually git rm them to resolve conflicts with git cherry-pick. Add a testcase for this eventuality.
Additionally, add 1 unrelated real-world testcase taken from Mbed-TLS/mbedtls#6882.
Fix a problem with the branch rewrite script that prevented it working when the branch deletes files. Whenever there are deleted files, manually
git rm
them to resolve conflicts withgit cherry-pick
. Add a testcase for this eventuality.Additionally, add 1 unrelated real-world testcase taken from Mbed-TLS/mbedtls#6882.