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

Check effect of rebase-ff on single-commit PR #79

Closed
xmo-odoo opened this issue Jan 25, 2019 · 1 comment
Closed

Check effect of rebase-ff on single-commit PR #79

xmo-odoo opened this issue Jan 25, 2019 · 1 comment
Labels

Comments

@xmo-odoo
Copy link
Collaborator

xmo-odoo commented Jan 25, 2019

Should not do anything but I can't think of any other hypothesis as to why odoo/odoo#30525 did not work properly: there are no errors in the log

Staging pr odoo/odoo:30492 for target 12.0; squash=True
Staged pr odoo/odoo:30492 to 12.0 by rebase-ff: 925421684311a2cd7314dd01a80c1b67523acba4 -> b42cd64ace5f859184b8cc47a0db0963c03ae73b
Staging pr odoo/enterprise:3501 for target 12.0; squash=True
Staged pr odoo/enterprise:3501 to 12.0 by rebase-ff: 2a08d3b259ac70104310e8b8e206dd3afce3f614 -> ed9feaad29934429bb6352ac3561eb3280085095
Staging pr odoo/odoo:30525 for target 12.0; squash=True
Staged pr odoo/odoo:30525 to 12.0 by rebase-ff: b42cd64ace5f859184b8cc47a0db0963c03ae73b -> d5ffd327c76263007085f3a3cdb43923c69f3a5d
Staging pr odoo/odoo:30529 for target 12.0; squash=True
Staged pr odoo/odoo:30529 to 12.0 by rebase-ff: d5ffd327c76263007085f3a3cdb43923c69f3a5d -> ce6e66cef930a30d9a62988a16f9f8319cb9f25c

However the specified pr commit (d5ffd327) simply doesn't show up in any of odoo/odoo's branches, and the purported following commit (ce6e66ce) does show up with b42cd64a as its parent rather than the expected d5ffd327.

edit: weirder, odoo/odoo#30525 had been merged, but combined with ce6e66cef930a30d9a62988a16f9f8319cb9f25c

@xmo-odoo
Copy link
Collaborator Author

Doesn't seem to be that, I'll configure the mergebot logging to debug in order to try and gather more information in the eventual case this happens again.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

No branches or pull requests

1 participant