fix(merge,import): surface soft-removed components in merge and import output#10212
Open
davidfirst wants to merge 6 commits intomasterfrom
Open
fix(merge,import): surface soft-removed components in merge and import output#10212davidfirst wants to merge 6 commits intomasterfrom
davidfirst wants to merge 6 commits intomasterfrom
Conversation
…t output When a soft-removed component was re-imported and then merged from main, it was silently skipped with no indication of why. Now both commands surface actionable warnings: import warns the component is deleted and suggests `bit recover`, and lane merge explicitly lists soft-removed skips instead of hiding them behind `--verbose`.
Contributor
There was a problem hiding this comment.
Pull request overview
Surfaces soft-removed (“deleted”) components in bit import and bit lane merge outputs so users aren’t left with silent skips and have a clear recovery path.
Changes:
- Add an import-time warning when imported components are marked as deleted, with a suggested
bit recover+ re-merge flow. - Update merge reporting to always show soft-removed component skips (not gated behind
--verbose) and include a recovery hint. - Add an e2e scenario covering: delete-on-lane → re-import deleted comp → merge-from-main → recover → re-merge.
Reviewed changes
Copilot reviewed 3 out of 3 changed files in this pull request and generated 2 comments.
| File | Description |
|---|---|
scopes/scope/importer/import.cmd.ts |
Adds a removed-components warning block to bit import output. |
scopes/component/merging/merge-cmd.ts |
Adjusts merge failure reporting to always surface soft-removed skip information and provide guidance. |
e2e/harmony/lanes/bit-remove-on-lanes.e2e.ts |
Adds an end-to-end test for the deleted→re-import→merge→recover workflow. |
…ertions Address Copilot review: use exported `compHasBeenRemovedMsg` constant instead of brittle string match, and update existing tests to assert on the new "soft-removed" wording.
This file contains hidden or 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.
When a soft-removed component on a lane is re-imported and then merged from main, it was silently skipped with no actionable feedback.
bit import: now shows a yellow warning listing deleted components with a suggestion to runbit recoverthenbit lane merge main.bit lane merge: soft-removed component skips are now always shown (not hidden behind--verbose), with a hint to runbit recover.