summaryrefslogtreecommitdiff
path: root/doc/todo
diff options
context:
space:
mode:
authorGravatar Joey Hess <joeyh@joeyh.name>2016-03-31 19:05:47 -0400
committerGravatar Joey Hess <joeyh@joeyh.name>2016-03-31 19:05:47 -0400
commit7cd0ba73996b2ed092f8ee7cb62d0edf9f8f3f1b (patch)
tree6a23e810b4b3d8a3a4198a25190e0a8b3ce58c62 /doc/todo
parent4dfa6059e42995eb050f58656fc32f9ee5d3ef16 (diff)
parentdc6d60cb3cbeed45e0651818f762445812f84e7a (diff)
Merge branch 'adjustedbranch'
Diffstat (limited to 'doc/todo')
-rw-r--r--doc/todo/smudge.mdwn6
1 files changed, 0 insertions, 6 deletions
diff --git a/doc/todo/smudge.mdwn b/doc/todo/smudge.mdwn
index c615f8f14..a80869dc0 100644
--- a/doc/todo/smudge.mdwn
+++ b/doc/todo/smudge.mdwn
@@ -23,12 +23,6 @@ git-annex should use smudge/clean filters.
(May need to use libgit2 to do this efficiently, cannot find
any plumbing except git-update-index, which is very inneficient for
smudged files.)
-* 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. See [[design/adjusted_branches]].
-
* Eventually (but not yet), make v6 the default for new repositories.
Note that the assistant forces repos into direct mode; that will need to
be changed then, and it should enable annex.thin instead.