Mbed-TLS / mbedtls-docs

Version-independent documentation for Mbed TLS
Apache License 2.0
21 stars 28 forks source link

Branch rewrite script: handle deleted files #74

Closed gilles-peskine-arm closed 1 year ago

gilles-peskine-arm commented 1 year ago

Fix a failure of the branch rewrite script when a C file is deleted: this caused a modify/delete confict during cherry-pick.

I use an alternative approach compared with #71 which avoids creating an error situation where we ignore an error, but aren't sure that the error we're ignoring is the error we were expecting.

This pull request includes the non-controversial changes in https://github.com/Mbed-TLS/mbedtls-docs/pull/73 because I haven't bothered isolating the tests and managing the trivial add/add conflicts that rebasing would cause. The first new commit is "Fix handling of commits that delete a C file".