mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

interaction with shared clones

Browse source
This commit is contained in:
Joey Hess 2015-12-17 18:46:52 -04:00
parent e55ac3d383
commit fbf6c25de5
Failed to extract signature
1 changed files with 5 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

5
doc/todo/smudge.mdwn
View file

@ -348,6 +348,11 @@ files to be unlocked, while the indirect upgrades don't touch the files.
(when not in direct mode). (when not in direct mode).
However, beware over-optimisation breaking the assistant or perhaps other However, beware over-optimisation breaking the assistant or perhaps other
long-lived processes. 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. * Make automatic merge conflict resolution work for pointer files.
- Should probably automatically handle merge conflicts between annex - Should probably automatically handle merge conflicts between annex
symlinks and pointer files too. Maybe by always resulting in a pointer symlinks and pointer files too. Maybe by always resulting in a pointer