runbot/forwardport/tests
Xavier Morel be7788be0a [FIX] forwardport: git conflict markers
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.
2020-11-20 07:41:45 +01:00
..
conftest.py [IMP] runbot_merge: split staging cron in two 2020-02-11 08:07:57 +01:00
test_batches.py [FIX] forwardport: co-dependent FPs where one PR is updated 2019-10-15 08:54:25 +02:00
test_limit.py [FIX] forwardport: fix forward-port Odoo wiki link 2020-03-10 08:00:07 +01:00
test_simple.py [FIX] forwardport: git conflict markers 2020-11-20 07:41:45 +01:00
test_weird.py [ADD] forwardport: ability to skip CI when forward porting 2020-04-17 08:09:01 +02:00
utils.py [IMP] forwardport: on conflict note previous FP can be r+'d 2020-03-16 15:03:11 +01:00