Artifact 3f381d94e11e88a0aff15e74b35383f142dbea727b71f4467c0bbdec8607af7d:
- File
internal/stash/stash.go
-
2026-10-20 01:42:32
— part of check-in
[2ee5684bf3]
on branch feat/submanifest-reader
— fix(stash): do not merge a changed symlink, as fossil's stash apply does
Where a symlink was stashed or is now on disk, Apply writes the stashed file only when both are links and the link still holds the baseline. Otherwise it leaves the file and its row alone and reports it, as fossil's stash_apply prints "Cannot merge symlink" and counts a conflict. Apply and Pop now return the files they did not merge; Pop still drops the entry, as fossil's does. (user: [email protected], size: 22320) [annotate] [blame] [check-ins using]
- 2026-10-20 02:37:52 — part of check-in [79679cc3fa] on branch feat/submanifest-reader — Merge branch 'fix/symlink-write-paths' into feat/submanifest-reader (user: [email protected], size: 22320) [annotate] [blame] [check-ins using]
- 2026-10-20 02:45:47 — part of check-in [e4f56e44a9] on branch feat/submanifest-reader — Merge branch 'feat/submanifest-reader' into feat/sparse-store (user: [email protected], size: 22320) [annotate] [blame] [check-ins using]
-
2026-10-20 01:42:32
— part of check-in
[2ee5684bf3]
on branch feat/submanifest-reader
— fix(stash): do not merge a changed symlink, as fossil's stash apply does