Skip to content

Autonomous development for real products. Governed agents build from specs you approve, follow the rules you set, and nothing merges until another agent proves it. Your decisions, judgement and taste are the bar that work must clear. Declare your vision and let agents build it.

test(land): bind sibling conflict to its exact provenance [B3,R3,E8]

Corey Olson04bc9d64cb79
diff --git a/test/land.test.js b/test/land.test.js
index 50f865d1..11cee6f2 100644
--- a/test/land.test.js
+++ b/test/land.test.js
@@ -564,9 +564,12 @@ test('land names sibling conflicts whose reviews share the unchanged main [B3,R3
assert.deepEqual(dry.blocked, [], 'neither acceptance is stale against unchanged main');
assert.deepEqual(dry.conflicts, [], 'each sibling merges with the current main considered individually');
assert.deepEqual(dry.items, entries.map(entry => entry.item));
+ const reviewedCommit = box.git(entries[1].path, 'rev-parse', 'HEAD');
const result = json(box, box.repo, 'land');
assert.deepEqual(result.landed, [entries[0].item]);
- assert.deepEqual(result.conflicts, [{ id: entries[1].item, files: [FILES[0]] }], 'the actual batch names the collision between the two fresh siblings');
+ const trunk = box.git(box.repo, 'rev-parse', 'main');
+ assert.deepEqual(result.conflicts, [{ id: entries[1].item, files: [FILES[0]], trunk,
+ commit: reviewedCommit, reviewedCommit }], 'the actual batch binds the sibling collision to the landed trunk and exact reviewed commit');
});
/** Keep the complete private diagnostic refusal in a failing assertion before fixture cleanup deletes its logs. */