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

feat(FN-4500): complete Step 3 — add live zero-commit reclaim fast-path

Browse Source 
Fusion-Task-Id: FN-4500
Fusion-Task-Lineage: 81d33759-70f6-4958-abf8-3db20f918c01
This commit is contained in:
Fusion
2026-05-14 12:25:49 -07:00
committed by gsxdsm
parent bcb0035d1a
commit 14ef1041a1
3 changed files with 228 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -35,9 +35,9 @@ describe("inspectBranchConflict zero-unique behavior", () => {
const repoDir = await setupRepo();
await run("git checkout -b fusion/fn-9001", repoDir);
await run("git checkout main", repoDir);
const livePath = path.join(repoDir, "..", "live-9001");
const livePath = path.join(repoDir, "wt-live-9001");
await run(`git worktree add ${JSON.stringify(livePath)} fusion/fn-9001`, repoDir);
const stalePath = path.join(repoDir, "..", "stale-9001");
const stalePath = path.join(repoDir, "wt-stale-9001");
await mkdir(stalePath, { recursive: true });
const result = await inspectBranchConflict({
@@ -63,9 +63,9 @@ describe("inspectBranchConflict zero-unique behavior", () => {
await run("git checkout main", repoDir);
await run(`git cherry-pick ${branchCommit}`, repoDir);
const livePath = path.join(repoDir, "..", "live-9001-upstream");
const livePath = path.join(repoDir, "wt-live-9001-upstream");
await run(`git worktree add ${JSON.stringify(livePath)} fusion/fn-9001`, repoDir);
const stalePath = path.join(repoDir, "..", "stale-9001-upstream");
const stalePath = path.join(repoDir, "wt-stale-9001-upstream");
await mkdir(stalePath, { recursive: true });
const result = await inspectBranchConflict({
@@ -88,9 +88,9 @@ describe("inspectBranchConflict zero-unique behavior", () => {
await run("git commit -m 'feat(FN-9001): unique' -m 'Fusion-Task-Id: FN-9001'", repoDir);
await run("git checkout main", repoDir);
const livePath = path.join(repoDir, "..", "live-9001-unique");
const livePath = path.join(repoDir, "wt-live-9001-unique");
await run(`git worktree add ${JSON.stringify(livePath)} fusion/fn-9001`, repoDir);
const stalePath = path.join(repoDir, "..", "stale-9001-unique");
const stalePath = path.join(repoDir, "wt-stale-9001-unique");
await mkdir(stalePath, { recursive: true });
const result = await inspectBranchConflict({
@@ -113,9 +113,9 @@ describe("inspectBranchConflict zero-unique behavior", () => {
await run("git commit -m 'chore: other work'", repoDir);
await run("git checkout main", repoDir);
const livePath = path.join(repoDir, "..", "live-other");
const livePath = path.join(repoDir, "wt-live-other");
await run(`git worktree add ${JSON.stringify(livePath)} topic/other`, repoDir);
const stalePath = path.join(repoDir, "..", "stale-other");
const stalePath = path.join(repoDir, "wt-stale-other");
await mkdir(stalePath, { recursive: true });
const result = await inspectBranchConflict({