Carry commit from old PR is not included in rebase.

[RadekManak]

Broken PR: openshift/openstack-ironic#303

Log:

INFO - Logging to GitHub as an Application for repository https://github.com/openshift/openstack-ironic
INFO - Logging to GitHub as an Application for repository https://github.com/openshift-metal3/openstack-ironic
INFO - Destination repository is https://github.com/openshift/openstack-ironic.git
INFO - rebase repository is https://github.com/openshift-metal3/openstack-ironic.git
INFO - source repository is https://github.com/openstack/ironic.git
INFO - Fetching main from dest
INFO - Fetching master from source
INFO - Fetching all tags from source
INFO - Fetching all branches from source
INFO - Checking out source/master
INFO - Checking for existing rebase branch ironic-bot-master in https://github.com/openshift-metal3/openstack-ironic
INFO - Fetching existing rebase branch
INFO - Branches with commit:
  source/master
INFO - Preparing rebase branch
INFO - Merging upstream/master into main
INFO - Performing rebase
INFO - Merge base of source/master and dest/main: d264de34b05d3630d66f690db2ad5cedc8a9d02c
INFO - Merges on ancestry-path from merge_base=(d264de34b05d3630d66f690db2ad5cedc8a9d02c) to dest/main branch:
9d5762534b37e7f135fa39a7bbb5e375b02b92a1 || Merge pull request #278 from elfosardo/python312-tests || 148852131+openshift-merge-bot[bot]@users.noreply.github.com
4f253d85694587d8e731a7fa9023748a8eadff1d || Merge pull request #302 from openshift-metal3/ironic-bot-master || 148852131+openshift-merge-bot[bot]@users.noreply.github.com
01e8f9038480db3dc9b530924e943c600a9cb912 || merge upstream/master into main || metal-platform@redhat.com
INFO - Searching for merge commit from previous rebasebot run to identify downstream commits
INFO - Checking: "Merge pull request #278 from elfosardo/python312-tests"
INFO - Skipping this downstream (PR) merge commit as we are only interested in the rebase merges
INFO - Checking: "Merge pull request #302 from openshift-metal3/ironic-bot-master"
INFO - Skipping this downstream (PR) merge commit as we are only interested in the rebase merges
INFO - Checking: "merge upstream/master into main"
INFO - Found merge commit from previous rebase: 01e8f9038480db3dc9b530924e943c600a9cb912
INFO - Its parent d264de34b05d3630d66f690db2ad5cedc8a9d02c is on upstream branch master
INFO - Cutoff commits: ['^f06c8fd049a463ae4d790db0dfda6c67742630b0', '^d264de34b05d3630d66f690db2ad5cedc8a9d02c']
INFO - Identified downstream commits:
fcc28724d83bf5d4d7436b6c2f7c405558c01231 || UPSTREAM: <carry>: add OWNERS and test dockerfile back again || elfosardo@gmail.com
0e22918b592d06befb70ff7703465c9e87f2967d || UPSTREAM: <carry>: Do not upgrade test image || elfosardo@gmail.com
b83c0bca011c9992f20c1043148337f4505fefc8 || DPU modeling - parent_node DB/Model/API || juliaashleykreger@gmail.com
01fcd0484a2aac580e632368a1c58538c209e248 || follow-up on DPU change api-ref || juliaashleykreger@gmail.com
dc82040f57e1d10d04c809fa3b120d696758abf8 || UPSTREAM: <carry>: update base image for OCP 4.15 || elfosardo@gmail.com
e7712d7291f5e7275f7a5929262efabc7cf652f0 || UPSTREAM: <carry>: add ci-operator config || elfosardo@gmail.com
dba00542c21f625485fc1ba3d03a9e7076327aec || UPSTREAM: <carry>: install distro pbr || elfosardo@gmail.com
5065503ec0d680d12f854753d524edc5ef2e617b || Revert "UPSTREAM: <carry>: install distro pbr" || elfosardo@users.noreply.github.com
2c450e1b727de34f4d9c5d63b8f0b6e27bf0e375 || UPSTREAM: <carry>: fix ci operator config || elfosardo@gmail.com
de6b0e40ba7a6e55204a2d946a75e9fca845a664 || UPSTREAM: <carry>: update base image for OCP 4.16 || elfosardo@gmail.com
98e5bde3a77e9694f2381203a8ede1ca320a290c || UPSTREAM: <carry>: pin upper-constraints || elfosardo@gmail.com
d8de5b45428d8b671c9d0fe0e086efe86c03c0d2 || UPSTREAM: <carry>: update base image for tests || elfosardo@gmail.com
b66fc93e174abf32b32cd99d65fcb5e83a4a5f91 || UPSTREAM: <carry>: Run tests using Python 3.12 || elfosardo@gmail.com
99bb998bd76682a93daa13afa7f9fd7b3ccfa4e2 || UPSTREAM: <carry>: unpin upper-constraints || elfosardo@gmail.com
INFO - Picking commit: fcc28724d83bf5d4d7436b6c2f7c405558c01231 - UPSTREAM: <carry>: add OWNERS and test dockerfile back again
INFO - Picking commit: 0e22918b592d06befb70ff7703465c9e87f2967d - UPSTREAM: <carry>: Do not upgrade test image
INFO - Picking commit: b83c0bca011c9992f20c1043148337f4505fefc8 - DPU modeling - parent_node DB/Model/API
INFO - Picking commit: 01fcd0484a2aac580e632368a1c58538c209e248 - follow-up on DPU change api-ref
INFO - Picking commit: dc82040f57e1d10d04c809fa3b120d696758abf8 - UPSTREAM: <carry>: update base image for OCP 4.15
INFO - Picking commit: e7712d7291f5e7275f7a5929262efabc7cf652f0 - UPSTREAM: <carry>: add ci-operator config
INFO - Picking commit: dba00542c21f625485fc1ba3d03a9e7076327aec - UPSTREAM: <carry>: install distro pbr
INFO - Picking commit: 5065503ec0d680d12f854753d524edc5ef2e617b - Revert "UPSTREAM: <carry>: install distro pbr"
INFO - Picking commit: 2c450e1b727de34f4d9c5d63b8f0b6e27bf0e375 - UPSTREAM: <carry>: fix ci operator config
INFO - Picking commit: de6b0e40ba7a6e55204a2d946a75e9fca845a664 - UPSTREAM: <carry>: update base image for OCP 4.16
INFO - Picking commit: 98e5bde3a77e9694f2381203a8ede1ca320a290c - UPSTREAM: <carry>: pin upper-constraints
INFO - Picking commit: d8de5b45428d8b671c9d0fe0e086efe86c03c0d2 - UPSTREAM: <carry>: update base image for tests
INFO - Picking commit: b66fc93e174abf32b32cd99d65fcb5e83a4a5f91 - UPSTREAM: <carry>: Run tests using Python 3.12
INFO - Picking commit: 99bb998bd76682a93daa13afa7f9fd7b3ccfa4e2 - UPSTREAM: <carry>: unpin upper-constraints
INFO - Checking for ART pull request
INFO - Checking for existing pull request
INFO - No existing pull request found
INFO - Existing rebase branch needs to be updated.
INFO - Creating a pull request
INFO - I created a new rebase PR: https://github.com/openshift/openstack-ironic/pull/303

Expected:
Commit UPSTREAM: : Run tests using Python 3.12 - b66fc93e174abf32b32cd99d65fcb5e83a4a5f91 is picked up by the rebase

Actual:
Commit is not included

[RadekManak]

I looked at this issue today and I misidentified the root cause in the initial triage.

The commit was actually correctly cherry-picked as evidenced by:
INFO - Picking commit: b66fc93e174abf32b32cd99d65fcb5e83a4a5f91 - UPSTREAM: : Run tests using Python 3.12

The issue was that it was cherry-picked out of order it initially merged. This is because we used --author-date-order in the git log command. I believe the proper fix is to use --chrono-order which correctly orders the commits in the way they initially merged.

[RadekManak]

Fixed in #66