This commit is contained in:
Joey Hess 2015-12-10 14:54:03 -04:00
parent f80a3d8cd0
commit 108f711d37
Failed to extract signature

View file

@ -353,6 +353,11 @@ files to be unlocked, while the indirect upgrades don't touch the files.
- Should probably automatically handle merge conflicts between annex
symlinks and pointer files too. Maybe by always resulting in a pointer
file, since the symlinks don't work everwhere.
* Crippled filesystem should cause all files to be transparently unlocked.
Note that this presents problems when dealing with merge conflicts and
when pushing changes committed in such a repo. Ideally, should avoid
committing implicit unlocks, or should prevent such commits leaking out
in pushes.
----