revert: improve error message for cherry-pick during cherry-pick