mirror of
https://github.com/odoo/runbot.git
synced 2025-03-19 17:35:45 +07:00
3c88e033f6
This was the root cause of the incident of Feb 13/14: because the
patcher pushed to the local branch before pushing to the remote
failing to push to the remote would leave the local ref broken, as
`fetch("refs/heads/*:refs/heads/*")` apparently does not do non-ff
updates (which does make some sense I guess).
So in this case a staging finished, was pushed to the remote, then git
delayed the read side just enough that when the patcher looked up the
target it got the old commit. It applied a patch on top of that, tried
to push, and got a failure (non-ff update), which led the local and
remote branches divergent, and caused any further update of the local
reference branches to fail, thus every forward port to be blocked.
Using symbolic branches during patching was completely dumb (and
updating the local branch unnecessary), so switch the entire thing to
using just commits, and update a bunch of error reporting while at it.
|
||
|---|---|---|
| .. | ||
| backport | ||
| crons | ||
| ir_cron | ||
| project_freeze | ||
| staging_cancel | ||
| __init__.py | ||
| batch.py | ||
| commands.py | ||
| events_sources.py | ||
| ir_actions.py | ||
| ir_ui_view.py | ||
| mail_thread.py | ||
| patcher.py | ||
| project.py | ||
| pull_requests.py | ||
| res_partner.py | ||
| stagings_create.py | ||
| utils.py | ||