Integrated: 1069: PR ends up in bad state if interrupted just after push

Erik Joelsson erikj at
Wed Jun 9 20:52:51 UTC 2021

On Mon, 7 Jun 2021 21:44:02 GMT, Erik Joelsson <erikj at> wrote:

> This change adds a new transaction step when integrating a PR, to better handle if the bot gets interrupted mid integration. Currently, if the change is pushed and the bot is interrupted before closing, changing labels or adding the final "commit pushed" comment, the PR can end up in a limbo state.
> The new step is another comment "Going to push commit as ..." which gets added right before the git push command is run. Using this comment, it's now possible to automatically recover if the bot gets interrupted. The integration command checks for any such comments and if found, checks if the commit hash is present in the target. If it is, the PR was already pushed, and the command will just close it out as normal.
> I also decided to move the output of any rebase command to this prepush comment, so we don't risk losing it.

This pull request has now been integrated.

Changeset: 3091beec
Author:    Erik Joelsson <erikj at>
Stats:     487 lines in 7 files changed: 445 ins; 32 del; 10 mod

1069: PR ends up in bad state if interrupted just after push

Reviewed-by: kcr



More information about the skara-dev mailing list