From b99a1fefc04f76fc0c5e7bd89c091d05c0d66299 Mon Sep 17 00:00:00 2001 From: Xavier-Do Date: Wed, 2 Aug 2023 08:21:55 +0200 Subject: [PATCH] [IMP] runbot: allow to define a base_batch manually --- runbot/models/batch.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/runbot/models/batch.py b/runbot/models/batch.py index eaea5f39..ac240b8e 100644 --- a/runbot/models/batch.py +++ b/runbot/models/batch.py @@ -230,7 +230,9 @@ class Batch(models.Model): # 2. FIND missing commit in a compatible base bundle if not bundle.is_base: merge_base_commits = self.commit_link_ids.mapped('merge_base_commit_id') - if auto_rebase: + if self.base_reference_batch_id: + self._log('Using a defined reference batch [%s](%s)', self.base_reference_batch_id.id, self.base_reference_batch_id._url()) + elif auto_rebase or not bundle.branch_ids: self.base_reference_batch_id = last_base_batch else: self.base_reference_batch_id = False