summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorGravatar Joey Hess <joeyh@joeyh.name>2015-12-17 18:46:52 -0400
committerGravatar Joey Hess <joeyh@joeyh.name>2015-12-17 18:46:52 -0400
commit4263eb776a3b81354c77d2a1b3fd997ed85f1c3c (patch)
tree9fadd61fa14befe35f5fa262e9998c3409662672 /doc
parentab1394407f265cd3b603aba93205d05d64a5d996 (diff)
interaction with shared clones
Diffstat (limited to 'doc')
-rw-r--r--doc/todo/smudge.mdwn5
1 files changed, 5 insertions, 0 deletions
diff --git a/doc/todo/smudge.mdwn b/doc/todo/smudge.mdwn
index 7a254322a..63f05c42b 100644
--- a/doc/todo/smudge.mdwn
+++ b/doc/todo/smudge.mdwn
@@ -348,6 +348,11 @@ files to be unlocked, while the indirect upgrades don't touch the files.
(when not in direct mode).
However, beware over-optimisation breaking the assistant or perhaps other
long-lived processes.
+* Interaction with shared clones. Should avoid hard linking from/to a
+ object in a shared clone if either repository has the object unlocked.
+ (And should avoid unlocking an object if it's hard linked to a shared clone,
+ but that's already accomplished because it avoids unlocking an object if
+ it's hard linked at all)
* Make automatic merge conflict resolution work for pointer files.
- Should probably automatically handle merge conflicts between annex
symlinks and pointer files too. Maybe by always resulting in a pointer