change "bit lane merge main" default to include non-lane components #8279
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
GiladShoham
approved these changes
Dec 18, 2023
davidfirst
added a commit
that referenced
this pull request
Dec 29, 2023
…ne when merging from main (#8337) Due to a recent change #8279, the default when running `bit lane merge main` is to include non-lane components. The issue is that these non-lane components were also added to the lane object. So for example, if a workspace has 10 components and only 2 were part of the lane, after the merge, all 10 components became part of the lane. This PR fixes it by updating non-lane components in the .bitmap/file-system but not adding them to the lane object. If the flag `--exclude-non-lane-comps` is used, then it doesn't touch these non-lane components.
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 scenario is when on a lane and some of the workspace components belong to main and are not part of the lane.
In case these main components are out of date, how to update them?
In the past,
bit checkout headwas the way to go. This had been changed to not include them, see here the reason.Currently,
bit lane merge maintakes care of these components. However, a change done 4 months ago, required a flag--include-non-lane-compsto include them.Turns out that this is confusing, and for the most cases, it is expected to include them by default without any flag.
This PR does exactly this. In case these components are not wanted, a new flag has introduced:
--exclude-non-lane-compsto exclude them.Edit: this PR caused a regression by adding non-lane components into the lane object. This issue has been fixed in this PR: #8337