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

current thoughts

Browse source
This commit is contained in:
Joey Hess 2011-04-07 12:33:48 -04:00
parent ab0e03498f
commit 079e57adf7
1 changed files with 10 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
doc/todo/branching.mdwn
View file

@ -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]]