From fbf6c25de56fbdf25184052b7e38c4cedfe2a5bf Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 17 Dec 2015 18:46:52 -0400 Subject: [PATCH] interaction with shared clones --- doc/todo/smudge.mdwn | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/doc/todo/smudge.mdwn b/doc/todo/smudge.mdwn index 7a254322aa..63f05c42bf 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