NextERP/runbot
5
0
Fork 0
mirror of https://github.com/odoo/runbot.git synced 2025-03-27 13:25:47 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

[FIX] forwardport: git conflict markers

Browse Source 
2.29 changed the formatting of conflict labels (the stuff added at the
end of the closing conflict marker):
6cceea19eb

Used to be

    >>>>>>> <commit>... <text>

now is

    >>>>>>> <commit> (<text>)

Just ignore everything after the commit hash.
This commit is contained in:
Xavier Morel 2020-11-12 07:54:10 +01:00
parent 733ab2dd43
commit be7788be0a
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
forwardport/tests/test_simple.py
View File

@ -359,7 +359,7 @@ More info at https://github.com/odoo/odoo/wiki/Mergebot#forward-port
a a
======= =======
0 0
>>>\x3e>>> [0-9a-f]{7,}(...)? temp >>>\x3e>>> [0-9a-f]{7,}.*
'''), '''),
} }
[project] = env['runbot_merge.project'].search([]) [project] = env['runbot_merge.project'].search([])
@ -538,7 +538,7 @@ def test_conflict(env, config, make_repo, users):
a a
======= =======
xxx xxx
>>>\x3e>>> [0-9a-f]{7,}(...)? temp >>>\x3e>>> [0-9a-f]{7,}.*
'''), '''),
} }
assert prod.get_pr(prb_id.number).comments == [ assert prod.get_pr(prb_id.number).comments == [