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
Sync script: handle multi commit merges #578
Conversation
Signed-off-by: Todd Short <todd.short@me.com>
This modifies no OLM code; so everything ought to pass. |
/retest |
/label docs-approved downstream-only sync infrastructure changes only |
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: grokspawn, tmshort The full list of commands accepted by this bot can be found here. The pull request process is described here
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
@tmshort: all tests passed! Full PR test history. Your PR dashboard. Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here. |
Fix the sync script to handle commits in a single merge.
The sorting doesn't work as the commit time is all the same, and the next sortable field is the headline.
The commit time is the same, but the authorship time for each commit might be different or out of order.
Add an ordinal to the list of commits from each branch. This is used to sort commits (in original order) with the same commit time.
This is for the bash-based sync scripts.