From c7588c32fd67423aac09e1b5c7abf109811528b1 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@odoo.com>
Date: Tue, 26 Nov 2019 16:23:36 +0100
Subject: [PATCH] [FIX] forwardport: triggers conflict markers detection

Conflict marker checker looks for 7 <s or >s in a row. The forwardport
contains exactly that. So replace one of the literal signs by a hex
escape.
---
 forwardport/tests/test_simple.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/forwardport/tests/test_simple.py b/forwardport/tests/test_simple.py
index aa9ebc54..fbc4fc81 100644
--- a/forwardport/tests/test_simple.py
+++ b/forwardport/tests/test_simple.py
@@ -341,11 +341,11 @@ More info at https://github.com/odoo/odoo/wiki/Mergebot#forward-port
     assert prod.read_tree(prod.commit(pr2.head)) == {
         'f': 'c',
         'g': 'a',
-        'h': re_matches(r'''<<<<<<< HEAD
+        'h': re_matches(r'''<<<\x3c<<< HEAD
 a
 =======
 0
->>>>>>> [0-9a-f]{7,}(...)? temp
+>>>\x3e>>> [0-9a-f]{7,}(...)? temp
 '''),
     }
 
@@ -392,11 +392,11 @@ def test_conflict(env, config, make_repo):
     assert c.committer == p.committer
     assert prod.read_tree(c) == {
         'f': 'c',
-        'g': re_matches(r'''<<<<<<< HEAD
+        'g': re_matches(r'''<<<\x3c<<< HEAD
 a
 =======
 xxx
->>>>>>> [0-9a-f]{7,}(...)? temp
+>>>\x3e>>> [0-9a-f]{7,}(...)? temp
 '''),
     }