mirror of
https://github.com/odoo/runbot.git
synced 2025-03-18 17:05:44 +07:00
2742fe18fd
When inserting a new branch, if there are extant forward ports sequences spanning over the insertion, new forward ports must be created for the new branch. This was the case, *however* one of the cases was handled incorrectly: PR batches (PRs to different repositories staged together) must be forward-ported as batches. However when creating the "insert" batches, these PRs would be split apart, leading to either inconsistent states or an inability to merge the new forward ports (if they are co-dependent which is a common case). This is because the handler would look for all the relevant PRs to forward ports, but it would fail to group them by label thereafter. Fix that, create the `insert` batches correctly, and augment the relevant test with an additional repository to test this case. No gh issue was created, but this problem was reported on odoo/odoo#110029 and odoo/enterprise#35838 (they were re-linked by hand in the runbot and mergebot, but on github the labels remain visibly different, one having the slug ZCwE while the other hasO7Pr). It's possible that the problem had occurred previously and not been noticed (or reported), though it's also possible this issue had never occurred before: for the latest freeze (16.1) there were 18 forward ports spanning the insertion, but of them only 2 were the same batch. |
||
|---|---|---|
| .. | ||
| conftest.py | ||
| test_batches.py | ||
| test_conflicts.py | ||
| test_limit.py | ||
| test_overrides.py | ||
| test_simple.py | ||
| test_updates.py | ||
| test_weird.py | ||