Xavier Morel b21fbaf9cc [IMP] runbot_merge: prevent merging empty commits ... The low-level APIs used by the staging process don't do any merge check, so because of the way Git works it's possible for them to merge commits with content as empty commits, e.g. if something was merged then backported and the backport was merged on top. This should trigger a merge failure as we don't really want to merge newly empty. This is a feature which some high level commands of git support, kind-of, e.g. by default `git rebase --interactive` will ask about newly empty commits. Take care to allow merging already-empty commits, as these do have a use for signaling, freezes, .... Fixes #809		2023-11-30 12:45:39 +01:00
..
crons	[ADD] runbot_merge: delete scratch branches when a branch is disabled	2023-08-31 09:07:01 +02:00
project_freeze	[FIX] runbot_merge: "not something we can merge" freeze error	2023-11-30 12:45:39 +01:00
staging_cancel	[ADD] runbot_merge: stagings canceling wizard	2022-12-08 10:46:22 +01:00
__init__.py	[MOV] runbot_merge: all the staging creation code to a separate module	2023-08-25 15:04:48 +02:00
ir_actions.py	[IMP] runbot_merge: add json & requests to server actions context	2023-02-20 10:13:05 +01:00
project.py	[IMP] runbot_merge: make uniquifier commit optional	2023-11-30 12:45:39 +01:00
pull_requests.py	[ADD] runbot_merge: delete scratch branches when a branch is disabled	2023-08-31 09:07:01 +02:00
res_partner.py	[ADD] runbot_merge: remote user provisioning	2022-06-07 13:48:17 +02:00
stagings_create.py	[IMP] runbot_merge: prevent merging empty commits	2023-11-30 12:45:39 +01:00