Invert the load order of the merged branches #208
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
added 2 commits
September 3, 2020 16:03
The current master will fail if the scarlet branch also does not exist in scarlet_extensions. This commit adds the quiet `-q` parameter to ignore the error generated if the branch does not exist.
|
Build passes: https://travis-ci.org/github/pmelchior/scarlet/builds/723922001 No rush on this, but this ticket should get merged to master before any other branches, otherwise they will mess up the regression docs again. |
pmelchior
approved these changes
Sep 9, 2020
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
One of the datasets needed to make the regression testing docs work is the list of merged branches, in order. This is stored in a DynamoDB table with the name of the branch and the index order acting as the unique keys for the table. The problem is by default git returns the branches in order with the newest first, which causes problems when the table updates on a new merge to master.
This PR fixes the problem by inverting the order of the merged branches on write (in scarlet_extensions) and requires a simple change here to invert the order again so that we correctly use the "last N commits" in the correct order.