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: merge error message change in git

Browse Source 
Apparently 2.34:

* flipped around the "auto-merging" and "CONFLICT" messages on stdout,
  so just match the second one with wildcards around to ignore the
  location of the first
* changed the casing and content of everything after the `error` line
  on stderr, so just ignore it all (none of it's actually useful
  anyway)
This commit is contained in:
Xavier Morel 2021-11-18 08:20:50 +01:00
parent 4da0f5df69
commit 8c11db21a2
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
forwardport/tests/test_updates.py
View File

@ -393,15 +393,13 @@ WARNING: the update of {pr2_id.display_name} to {pr2_id.head} has caused a \
conflict in this pull request, data may have been lost. conflict in this pull request, data may have been lost.
stdout: stdout:
``` ```.*?
CONFLICT \(add/add\): Merge conflict in h CONFLICT \(add/add\): Merge conflict in h.*?
Auto-merging h
``` ```
stderr: stderr:
``` ```
\\d{{2}}:\\d{{2}}:\\d{{2}}.\\d+ .* {pr2_id.head} \\d{{2}}:\\d{{2}}:\\d{{2}}.\\d+ .* {pr2_id.head}
error: could not apply [0-9a-f]+\\.\\.\\. newfiles error: could not apply [0-9a-f]+\\.\\.\\. newfiles
hint: after resolving the conflicts, mark the corrected paths ''', re.DOTALL))
.*''', re.DOTALL))
] ]