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

Fixed bug where checked out code not matching revision #198

Merged
merged 1 commit into from
Jul 28, 2021

Conversation

SeanTAllen
Copy link
Member

When a dependency had a version constraint rather than a single value,
the first time corral update was run, you wouldn't end up with the
correct code checked out. The constraint was correctly solved, but the
checked out code would be for branch main.

The problem arose because we first have to check something out and then
can do constraint solving.

This commit makes the change to keep track of what "something" was that
was initially checked out and if it differs from what we eventually
determine the revision should be, we run another update to get the
contents of _corral into the correct state.

When a dependency had a version constraint rather than a single value,
the first time `corral update` was run, you wouldn't end up with the
correct code checked out. The constraint was correctly solved, but the
checked out code would be for branch `main`.

The problem arose because we first have to check something out and then
can do constraint solving.

This commit makes the change to keep track of what "something" was that
was initially checked out and if it differs from what we eventually
determine the revision should be, we run another update to get the
contents of `_corral` into the correct state.
@SeanTAllen SeanTAllen added the changelog - changed Automatically add "Changed" CHANGELOG entry on merge label Jul 27, 2021
@SeanTAllen SeanTAllen requested a review from jemc July 27, 2021 21:37
@SeanTAllen SeanTAllen added changelog - fixed Automatically add "Fixed" CHANGELOG entry on merge and removed changelog - changed Automatically add "Changed" CHANGELOG entry on merge labels Jul 27, 2021
@jemc jemc merged commit 64bbe3e into main Jul 28, 2021
@jemc jemc deleted the fetch-finishes-correct branch July 28, 2021 14:51
github-actions bot pushed a commit that referenced this pull request Jul 28, 2021
github-actions bot pushed a commit that referenced this pull request Jul 28, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
changelog - fixed Automatically add "Fixed" CHANGELOG entry on merge
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants