NextERP/runbot
5
0
Fork 0
mirror of https://github.com/odoo/runbot.git synced 2025-03-15 23:45:44 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

[FIX] forwardport: triggers conflict markers detection

Browse Source 
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.
This commit is contained in:
Xavier Morel 2019-11-26 16:23:36 +01:00
parent f23fb2a35b
commit c7588c32fd
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
forwardport/tests/test_simple.py
View File

@ -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
'''),
}