fix(status), avoid showing pending-merge when an out-of-date component was merged from another lane #7285
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
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.
The use-case is when lane-a has a component that is out of date against main. This lane is now merged into lane-b and a new snap is added to this component.
Because lane-b is not a fork of lane-a, when comparing the local vs remote for the diverge-data, we compare this component against main.
When comparing against main, the component is indeed diverged, however, it should not be in "pending merge" section of bit-status. Pending merge is only when a component is diverged against the remote scope. Not against main.
This PR fixes it by not using the default
getDivergeDataand instead comparing always to the remote-scope.