Parents and children of check-in [aec658f5a9]
|
2026-10-20
| ||
| 02:37 | Merge branch 'fix/symlink-write-paths' into feat/submanifest-reader check-in: 79679cc3fa user: [email protected] tags: feat/submanifest-reader, main, trunk | |
| 01:42 | test(stash): fossil and go both refuse to merge a repointed symlink check-in: aec658f5a9 user: [email protected] tags: feat/submanifest-reader, main, trunk | |
| 01:42 |
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. check-in: 2ee5684bf3 user: [email protected] tags: feat/submanifest-reader, main, trunk | |