fix(lanes): add history entry when merging lanes without snap#10149
fix(lanes): add history entry when merging lanes without snap#10149davidfirst merged 3 commits intomasterfrom
Conversation
When merging one lane into another without creating a snap (fast-forward merge), no history entry was recorded. This adds a 'merge from "scope/lane"' entry to the lane history during merge operations. Also fixes lane history import to merge with existing local history instead of overwriting it, which was causing locally-created history entries to be lost.
There was a problem hiding this comment.
Pull request overview
This PR adds history tracking for lane merge operations and fixes how imported lane histories are handled. When merging one lane into another without creating a snap (fast-forward merge), a history entry is now recorded. Additionally, when importing lane history, it now merges with existing local history instead of overwriting it.
Key Changes
- Lane merges now create a history entry with the message format "merge from 'scope/lane'"
- Imported lane histories are merged with existing local histories instead of overwriting them
- E2E test added to verify history entries are created during fast-forward lane merges
Reviewed changes
Copilot reviewed 3 out of 3 changed files in this pull request and generated 1 comment.
| File | Description |
|---|---|
| scopes/component/merging/merging.main.runtime.ts | Adds lane history entry when saving merged lane |
| components/legacy/scope/component-ops/scope-components-importer.ts | Merges imported lane history with existing local history instead of overwriting |
| e2e/harmony/lanes/lane-history-merge.e2e.ts | New e2e test verifying history entries are added during lane merges |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
There was a problem hiding this comment.
Pull request overview
Copilot reviewed 3 out of 3 changed files in this pull request and generated no new comments.
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
Summary
merge from "scope/lane"history entry when merging one lane into anotherProblem
When merging one lane into another without creating a snap (fast-forward merge), no history entry was recorded. Additionally, running
bit lane historywould import the remote lane history and overwrite local entries.Changes
merging.main.runtime.ts: Add history entry when saving lane during mergescope-components-importer.ts: Merge imported lane history with existing local history