From 09ad9e048d9d9a19ae97895f8c7185d74f3ff75d Mon Sep 17 00:00:00 2001
From: David First <davidnet@gmail.com>
Date: Thu, 16 Feb 2023 12:28:18 -0500
Subject: [PATCH] fix(merge-from-scope): filter out soft-removed components
 before checking for squash eligibility (#7049)

---
 scopes/lanes/merge-lanes/merge-lanes.main.runtime.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/scopes/lanes/merge-lanes/merge-lanes.main.runtime.ts b/scopes/lanes/merge-lanes/merge-lanes.main.runtime.ts
index a5825201dc4a..f8e3a8896e30 100644
--- a/scopes/lanes/merge-lanes/merge-lanes.main.runtime.ts
+++ b/scopes/lanes/merge-lanes/merge-lanes.main.runtime.ts
@@ -298,6 +298,7 @@ export class MergeLanesMain {
     const bitObjectsPerComp = await pMapSeries(idsToMerge, async (id) => {
       const modelComponent = await this.scope.legacyScope.getModelComponent(id);
       const fromVersionObj = await modelComponent.loadVersion(id.version as string, repo);
+      if (fromVersionObj.isRemoved()) return undefined;
       const fromLaneHead = modelComponent.getRef(id.version as string);
       if (!fromLaneHead) throw new Error(`lane head must be defined for ${id.toString()}`);
       const toLaneHead = toLaneObj ? toLaneObj.getComponent(id)?.head : modelComponent.head || null;