You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
{{ message }}
Repository navigation
shape-doctor.py pin_restore: a shape copy renamed on one side of a merge conflicts under its new name, which no pin's row lists, so the why never names it and only the merge row does #753
Goal: a conflicted file that is a shape copy under its old name is named in pin_restore's why and its left_for_a_person, as #736 does for copies only the other side's pin lists. The reader then learns it is a copy and that a person settles it.
Filed by lane openRepoShape-3 under v1.1.1, on Brett Heap's word of 2026-10-16T13:35:28Z ("yes create v1.1.1"). Lane 3's reviewer RV-b found it while reviewing #736 (#687). It is not a regression: main does the same. It is the same family as #687.
What happens. RV-b measured this on main 66b230ed and on #736:
Ours renamed the Makefile to build.mk and theirs edited the Makefile.
The merge conflicts at build.mk, which no pin's row lists.
The why and left_for_a_person leave it out. Only the merge row lists the unmerged path.
What to do:
Where a conflicted path's stages came from a rename of a path some side's pin lists, name it with the old path ("build.mk, renamed from the copy Makefile") and give it to a person. Never take it whole.
git's rename detection over the stage entries, or the merge's own rename record, can find the old path.
CLAIMED — lane openRepoShape-3, session b30e8b49-f249-4668-adb1-1dbfa93c09e1@Eagle, 2026-10-16T23:31:37Z, for #753
Logged in lanes/log/openRepoShape-3.md at ede228dfebdf401926b3218cc16745fe535cc38f.
The three reads (lane-collision-protocol Rule 1):
1. existing `CLAIMED —` comments on opensoft/openRepoShape#753:
none
2. `gh pr list --repo opensoft/openRepoShape --state all --search "#753"`, kept where the row or its body names `#753`:
none
3. `git ls-remote --heads git@github.com:opensoft/openRepoShape` branches naming `753` as a whole token:
none
Activity
brettheap commentedon Oct 16, 2026
CLAIMED — lane openRepoShape-3, session b30e8b49-f249-4668-adb1-1dbfa93c09e1@Eagle, 2026-10-16T23:31:37Z, for #753
Logged in
lanes/log/openRepoShape-3.mdatede228dfebdf401926b3218cc16745fe535cc38f.The three reads (lane-collision-protocol Rule 1):
shape-doctor.py: a conflicted shape pin's NEXT reads both sides' pins…
shape-doctor.py: a conflicted path is a copy's rename only where one …
tests/test_doctor_pin_restore_merges.py: a project's own file with by…
shape-doctor.py: a shape copy renamed on one side of a merge, conflic…