update
This commit is contained in:
parent
208bba8d30
commit
14d7b2ac13
3 changed files with 3 additions and 18 deletions
6
Annex.hs
6
Annex.hs
|
@ -34,7 +34,7 @@ startAnnex :: IO State
|
|||
startAnnex = do
|
||||
r <- gitRepoFromCwd
|
||||
r' <- prepUUID r
|
||||
gitPrep r'
|
||||
gitSetup r'
|
||||
|
||||
return State {
|
||||
repo = r',
|
||||
|
@ -129,8 +129,8 @@ annexPullRepo :: State -> String -> IO ()
|
|||
annexPullRepo state reponame = do error "not implemented" -- TODO
|
||||
|
||||
{- Sets up a git repo for git-annex. May be called repeatedly. -}
|
||||
gitPrep :: GitRepo -> IO ()
|
||||
gitPrep repo = do
|
||||
gitSetup :: GitRepo -> IO ()
|
||||
gitSetup repo = do
|
||||
-- configure git to use union merge driver on state files
|
||||
exists <- doesFileExist attributes
|
||||
if (not exists)
|
||||
|
|
11
demo.log
11
demo.log
|
@ -1,11 +0,0 @@
|
|||
1286654242s 1 repo
|
||||
1286652724s 0 foo
|
||||
1286656282s 1 foo
|
||||
1286656282s 0 repo
|
||||
1286656281s 0 foo
|
||||
# some garbage, should be ignored
|
||||
a a a
|
||||
|
||||
a 1 a
|
||||
-1 a a
|
||||
1286652724.0001s 1 foo
|
|
@ -79,10 +79,6 @@ only copies of a file.
|
|||
The `.git-annex` directory at the top of the repository is used to store
|
||||
git-annex information that should be propigated between repositories.
|
||||
|
||||
Data is stored here in files that are arranged to avoid conflicts in most
|
||||
cases. A conflict could occur if a file with the same name but different
|
||||
content was added to different repositories.
|
||||
|
||||
## key/value storage
|
||||
|
||||
git-annex uses a key/value abstraction layer to allow files contents to be
|
||||
|
|
Loading…
Reference in a new issue