summaryrefslogtreecommitdiff
path: root/doc/todo/branching.mdwn
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2011-06-20 13:19:08 -0400
committerGravatar Joey Hess <joey@kitenet.net>2011-06-20 21:37:18 -0400
commite593a81041f3c55e8b2803d4cc07adc9b206b46f (patch)
tree2eb57c56653d858aaf7c2527cd577d1d27f39c49 /doc/todo/branching.mdwn
parentbc731ba6e0b94c7d5d4be5ba3c5c13d6644183f9 (diff)
update
Diffstat (limited to 'doc/todo/branching.mdwn')
-rw-r--r--doc/todo/branching.mdwn6
1 files changed, 4 insertions, 2 deletions
diff --git a/doc/todo/branching.mdwn b/doc/todo/branching.mdwn
index 79f278480..a035e53e8 100644
--- a/doc/todo/branching.mdwn
+++ b/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