summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2011-04-07 12:33:48 -0400
committerGravatar Joey Hess <joey@kitenet.net>2011-04-07 12:33:48 -0400
commit079e57adf77de3601d9fe0df63aa472317889c11 (patch)
treed860dd382b50ab77bacc8f6d82d42d0490d98468 /doc
parentab0e03498f8a52bdf140587a4c7e13b8fe949ce7 (diff)
current thoughts
Diffstat (limited to 'doc')
-rw-r--r--doc/todo/branching.mdwn10
1 files changed, 10 insertions, 0 deletions
diff --git a/doc/todo/branching.mdwn b/doc/todo/branching.mdwn
index b7441c6e4..06bd50bee 100644
--- a/doc/todo/branching.mdwn
+++ b/doc/todo/branching.mdwn
@@ -105,3 +105,13 @@ too.
The problem would then be that any locationlog lookup would need to look in
all other branches (any branch could have more current info after all),
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
+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
+require some tighter integration with git, so that after a pull, the log
+repo is updated with the data pulled. --[[Joey]]