From 2f4a6f82ff5678fe3c50ae1f66c9f0ea6d7f56d4 Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Wed, 17 Oct 2018 16:55:53 +0200 Subject: [PATCH] [IMP] runbot_merge: quickfix to mark PRs as merging Apparently the split and move arounds caused the _tagstate to get computed/updated earlier (/differently), and thus the tagging update relying on it to... not work anymore. At least restore adding a "merging" tag when a PR is staged. --- runbot_merge/models/pull_requests.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runbot_merge/models/pull_requests.py b/runbot_merge/models/pull_requests.py index 9f17c184..54755b10 100644 --- a/runbot_merge/models/pull_requests.py +++ b/runbot_merge/models/pull_requests.py @@ -356,7 +356,7 @@ class Branch(models.Model): Tagging.create({ 'pull_request': pr.number, 'repository': pr.repository.id, - 'state_from': pr._tagstate, + 'state_from': 'ready', 'state_to': 'staged', })