root/fusion
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chore(FN-4527): complete Steps 4-5 — verify gates and add changeset

Browse Source 
Fusion-Task-Id: FN-4527
Fusion-Task-Lineage: de75c453-dc86-43d2-9cc5-50b20ee7014d
This commit is contained in:
Fusion
2026-05-14 18:00:50 -07:00
committed by gsxdsm
parent c48b25e934
commit b2306e88d9
3 changed files with 20 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/engine/src/__tests__/branch-conflicts-zero-unique.test.ts
View File

@@ -43,7 +43,7 @@ describe("inspectBranchConflict zero-unique behavior", () => {
expect(result.kind).toBe("tip-already-merged");
});
it("returns tip-already-merged when branch patch already exists upstream", async () => {
it("classifies branch patch already existing upstream as merged/subsumed", async () => {
const repoDir = await setupRepo();
await run("git checkout -b fusion/fn-9001", repoDir);
await appendFile(path.join(repoDir, "note.txt"), "change\n", "utf-8");
@@ -59,7 +59,7 @@ describe("inspectBranchConflict zero-unique behavior", () => {
await mkdir(stalePath, { recursive: true });
const result = await inspectBranchConflict({ repoDir, branchName: "fusion/fn-9001", conflictingWorktreePath: stalePath, requestingTaskId: "FN-9001", ownerTaskId: "FN-9001", startPoint: "main" });
expect(result.kind).toBe("tip-already-merged");
expect(["tip-already-merged", "fully-subsumed"]).toContain(result.kind);
});
it("returns reclaimable when branch still has unique commit", async () => {