From be7788be0add29cab93c8b20bdd2aeb1cf1df051 Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Thu, 12 Nov 2020 07:54:10 +0100 Subject: [PATCH] [FIX] forwardport: git conflict markers 2.29 changed the formatting of conflict labels (the stuff added at the end of the closing conflict marker): https://github.com/git/git/commit/6cceea19eb6b86a4a293c92fe9653ccc8bb71526 Used to be >>>>>>> ... now is >>>>>>> () Just ignore everything after the commit hash. --- forwardport/tests/test_simple.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/forwardport/tests/test_simple.py b/forwardport/tests/test_simple.py index 56d1e0b2..860e0d16 100644 --- a/forwardport/tests/test_simple.py +++ b/forwardport/tests/test_simple.py @@ -359,7 +359,7 @@ More info at https://github.com/odoo/odoo/wiki/Mergebot#forward-port a ======= 0 ->>>\x3e>>> [0-9a-f]{7,}(...)? temp +>>>\x3e>>> [0-9a-f]{7,}.* '''), } [project] = env['runbot_merge.project'].search([]) @@ -538,7 +538,7 @@ def test_conflict(env, config, make_repo, users): a ======= xxx ->>>\x3e>>> [0-9a-f]{7,}(...)? temp +>>>\x3e>>> [0-9a-f]{7,}.* '''), } assert prod.get_pr(prb_id.number).comments == [