update

doc/todo/branching.mdwn

@@ -47,6 +47,8 @@ Let's use one branch per uuid, named git-annex/$UUID.
   branches?
 - A given repo only ever writes to its UUID branch. So no conflicts.
   - **problem**: git annex move needs to update log info for other repos!
+    (possibly solvable by having git-annex-shell update the log info
+    when content is moved using it)
 - (BTW, UUIDs probably don't compress well, and this reduces the bloat of having
   them repeated lots of times in the tree.)
 - Per UUID branches mean that if it wants to find a file's location
@@ -77,7 +79,7 @@ with a indication of the presense/absense of the key is found.
   or transfered.
 - It could get pretty slow when digging deeper.
 - Only 3 places in git-annex will be affected by any slowdown: move --from,
-  get and drop.
+  get and drop. (Update: Now also unused, whereis, fsck) 
 
 ## alternate
 
@@ -109,7 +111,7 @@ which could get expensive.
 ## way outside the box approach
 
 Another approach I have been mulling over is keeping the log file
-branch checked out in .git-annex/logs/ -- this would be a checkout of a git
+branch checked out in .git/annex/logs/ -- this would be a checkout of a git
 repository inside a git repository, using "git fake bare" techniques. This
 would solve the merge problem, since git auto merge could be used. It would
 still mean all the log files are on-disk, which annoys some. It would