Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Forward Port of #36620 to saas-11.3 (failed) #36671

Conversation

@fw-bot
Copy link
Contributor

commented Sep 11, 2019

Cherrypicking df97a9d of source #36620 failed with the following

stdout:


stderr:

Performing inexact rename detection:  36% (990120/2736210)   
Performing inexact rename detection:  37% (1012420/2736210)   
Performing inexact rename detection:  38% (1041410/2736210)   
Performing inexact rename detection:  39% (1068170/2736210)   
Performing inexact rename detection:  40% (1094930/2736210)   
Performing inexact rename detection:  41% (1123920/2736210)   
Performing inexact rename detection:  42% (1150680/2736210)   
Performing inexact rename detection:  43% (1177440/2736210)   
Performing inexact rename detection:  44% (1204200/2736210)   
Performing inexact rename detection:  45% (1233190/2736210)   
Performing inexact rename detection:  46% (1259950/2736210)   
Performing inexact rename detection:  47% (1286710/2736210)   
Performing inexact rename detection:  48% (1313470/2736210)   
Performing inexact rename detection:  49% (1342460/2736210)   
Performing inexact rename detection:  50% (1369220/2736210)   
Performing inexact rename detection:  51% (1395980/2736210)   
Performing inexact rename detection:  52% (1424970/2736210)   
Performing inexact rename detection:  53% (1451730/2736210)   
Performing inexact rename detection:  54% (1478490/2736210)   
Performing inexact rename detection:  55% (1505250/2736210)   
Performing inexact rename detection:  56% (1534240/2736210)   
Performing inexact rename detection:  57% (1561000/2736210)   
Performing inexact rename detection:  58% (1587760/2736210)   
Performing inexact rename detection:  59% (1614520/2736210)   
Performing inexact rename detection:  60% (1643510/2736210)   
Performing inexact rename detection:  61% (1670270/2736210)   
Performing inexact rename detection:  62% (1697030/2736210)   
Performing inexact rename detection:  63% (1726020/2736210)   
Performing inexact rename detection:  64% (1752780/2736210)   
Performing inexact rename detection:  65% (1779540/2736210)   
Performing inexact rename detection:  66% (1806300/2736210)   
Performing inexact rename detection:  67% (1837520/2736210)   
Performing inexact rename detection:  68% (1862050/2736210)   
Performing inexact rename detection:  69% (1888810/2736210)   
Performing inexact rename detection:  70% (1915570/2736210)   
Performing inexact rename detection:  71% (1944560/2736210)   
Performing inexact rename detection:  72% (1971320/2736210)   
Performing inexact rename detection:  73% (1998080/2736210)   
Performing inexact rename detection:  74% (2024840/2736210)   
Performing inexact rename detection:  75% (2053830/2736210)   
Performing inexact rename detection:  76% (2080590/2736210)   
Performing inexact rename detection:  77% (2107350/2736210)   
Performing inexact rename detection:  78% (2136340/2736210)   
Performing inexact rename detection:  79% (2163100/2736210)   
Performing inexact rename detection:  80% (2189860/2736210)   
Performing inexact rename detection:  81% (2216620/2736210)   
Performing inexact rename detection:  82% (2245610/2736210)   
Performing inexact rename detection:  83% (2272370/2736210)   
Performing inexact rename detection:  84% (2299130/2736210)   
Performing inexact rename detection:  85% (2325890/2736210)   
Performing inexact rename detection:  86% (2354880/2736210)   
Performing inexact rename detection:  87% (2381640/2736210)   
Performing inexact rename detection:  88% (2408400/2736210)   
Performing inexact rename detection:  89% (2437390/2736210)   
Performing inexact rename detection:  90% (2468610/2736210)   
Performing inexact rename detection:  91% (2490910/2736210)   
Performing inexact rename detection:  92% (2519900/2736210)   
Performing inexact rename detection:  93% (2546660/2736210)   
Performing inexact rename detection:  94% (2575650/2736210)   
Performing inexact rename detection:  95% (2611330/2736210)   
Performing inexact rename detection:  96% (2626940/2736210)   
Performing inexact rename detection:  97% (2655930/2736210)   
Performing inexact rename detection:  98% (2684920/2736210)   
Performing inexact rename detection:  99% (2709450/2736210)   
Performing inexact rename detection: 100% (2736210/2736210)   
Performing inexact rename detection: 100% (2736210/2736210), done.
error: could not apply df97a9dcc89... [FIX] payment_sips: Wrong test and production URLs
hint: after resolving the conflicts, mark the corrected paths
hint: with 'git add <paths>' or 'git rm <paths>'
hint: and commit the result with 'git commit'
Recorded preimage for 'addons/payment_sips/models/payment.py'

Either perform the forward-port manually (and push to this branch, proceeding
as usual) or close this PR (maybe?).

In the former case, you may want to edit this PR message as well.

@robodoo robodoo added the seen 🙂 label Sep 11, 2019

@robodoo

This comment has been minimized.

Copy link
Contributor

commented Sep 11, 2019

@C3POdoo C3POdoo added the OE label Sep 11, 2019

@robodoo robodoo added the CI 🤖 label Sep 11, 2019

@simongoffin simongoffin force-pushed the odoo-dev:saas-11.3-11.0-opw-2061123-backport-fix-sig-7JVUO3SO-forwardport branch from efd1cb9 to 2ffc56f Sep 11, 2019

@robodoo robodoo removed the CI 🤖 label Sep 11, 2019

@simongoffin

This comment has been minimized.

Copy link
Contributor

commented Sep 11, 2019

robodoo r+

@xmo-odoo

This comment has been minimized.

Copy link
Collaborator

commented Sep 11, 2019

robodoo r-

@robodoo robodoo removed the r+ 👌 label Sep 11, 2019

@xmo-odoo

This comment has been minimized.

Copy link
Collaborator

commented Sep 11, 2019

@simongoffin seems odd that this PR would have 4600 commits to add to saas-11.3

@xmo-odoo

This comment has been minimized.

Copy link
Collaborator

commented Sep 11, 2019

I think you pushed a cherrypick on 12.0 to a PR targeted on 11.3

@simongoffin simongoffin force-pushed the odoo-dev:saas-11.3-11.0-opw-2061123-backport-fix-sig-7JVUO3SO-forwardport branch from 2ffc56f to e109ff1 Sep 11, 2019

@robodoo robodoo removed the CI 🤖 label Sep 11, 2019

[FIX] payment_sips: Wrong test and production URLs
The production/test urls were inverted.

opw:2061123

@simongoffin simongoffin force-pushed the odoo-dev:saas-11.3-11.0-opw-2061123-backport-fix-sig-7JVUO3SO-forwardport branch from e109ff1 to 3380a55 Sep 11, 2019

@robodoo robodoo added the CI 🤖 label Sep 11, 2019

@simongoffin

This comment has been minimized.

Copy link
Contributor

commented Sep 12, 2019

robodoo r+

robodoo pushed a commit that referenced this pull request Sep 12, 2019
[FIX] payment_sips: Wrong test and production URLs
The production/test urls were inverted.

opw:2061123

closes #36671

Signed-off-by: Simon Goffin (sig) <sig@openerp.com>

@robodoo robodoo added merged 🎉 and removed merging 👷 labels Sep 12, 2019

@robodoo

This comment has been minimized.

Copy link
Contributor

commented Sep 12, 2019

Merged at b7a9849, thanks!

@robodoo robodoo closed this Sep 12, 2019

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
5 participants
You can’t perform that action at this time.