mirror of
https://github.com/odoo/runbot.git
synced 2025-03-19 09:25:46 +07:00
6b1f698c23
If a PR is updated and has extent forward-ports, those forwardports
get updated automatically ("followup").
However there is an issue if the udpate causes a conflict in the
followup: the conflict gets silently pushed, and may fairly easily get
merged if it occurs in an area which the CI doesn't cover.
It's unclear what the policy really should be for this issue, and
there is no real way to *block* a pull request at the moment (save by
putting it in error at the mergebot level I guess?), so for now
clearly notify the user on both the modified PR and the followup,
with a comment on both.
We may want to revisit this eventually.
Fixes #467
|
||
|---|---|---|
| .. | ||
| __init__.py | ||
| forwardport.py | ||
| project.py | ||