runbot/runbot_merge/changelog
Xavier Morel c67bb64537 [ADD] *: fw=skipmerge
Skipmerge creates forward-ports before the source PR is even merged.

- In a break from the norm, skipmerge will create forwardports even in
  the face of conflicts.
- It will also not *detach* pull requests in case of conflicts, this
  is so the source PR can be updated and the update correctly cascades
  through the stack (likewise for any intermediate PR though *that*
  will detach as usual).

Note that this doesn't really look at outstandings, especially as they
were recently updated, so it might need to be fixed up in case of
freakout, but I feel like that should not be too much of an issue, the
authors will just get their FW reminders earlier than usual. If that's
a hassle we can always update the reminder job to ignore forward ports
whose source is not merged I guess.

Fixes #418
2025-02-04 08:05:15 +01:00
..
2021-09 [ADD] mergebot, forwardbot: changelog 2021-10-20 15:16:48 +02:00
2021-10 [ADD] mergebot, forwardbot: changelog 2021-10-20 15:16:48 +02:00
2022-06 [IMP] runbot_merge: automation around branch deactivation 2022-08-05 15:35:51 +02:00
2022-10 [FIX] runbot_merge: lock-in statuses after a staging has finished 2022-12-01 10:57:32 +01:00
2023-08 [ADD] *: changelog entries I forgot 2023-08-14 09:28:19 +02:00
2023-10 [IMP] forwardport: allow updating the fw limit after merging the source 2023-10-06 13:19:01 +02:00
2023-12 [ADD] runbot_merge: support staging ready PRs over splits 2024-05-23 07:58:58 +02:00
2024-08 [ADD] runbot_merge: rendering of PR descriptions 2024-07-15 10:28:28 +02:00
2025-02 [ADD] *: fw=skipmerge 2025-02-04 08:05:15 +01:00