Xavier Morel 6b1f698c23 [IMP] forwardport: handling of updates causing conflicts on followups ... 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		2021-08-24 15:39:47 +02:00
..
conftest.py	[IMP] runbot_merge: split staging cron in two	2020-02-11 08:07:57 +01:00
test_batches.py	[CHG] runbot_merge, forwardport: remove labelling	2020-11-20 07:41:54 +01:00
test_limit.py	[FIX] fwbot: properly prevent @up to on forward-port PRs	2021-08-24 15:39:47 +02:00
test_overrides.py	[IMP] forwardport: unmodified fw automatically inherit overrides	2021-01-13 16:11:14 +01:00
test_simple.py	[REF] forwardport: move PR update tests to their own module	2021-03-02 14:28:32 +01:00
test_updates.py	[IMP] forwardport: handling of updates causing conflicts on followups	2021-08-24 15:39:47 +02:00
test_weird.py	[IMP] forwardport: unmodified fw automatically inherit overrides	2021-01-13 16:11:14 +01:00