diff options
| author |  Joey Hess <joey@kitenet.net> | 2010-10-13 00:45:09 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2010-10-13 00:45:09 -0400 |
| commit | 14d7b2ac13318ba513bbab4f08b98434741f0e12 (patch) | |
| tree | 18886135d5de49ed28c9c084010c57676ee54db8 | |
| parent | 208bba8d3062133733d27a5db521013e3a2ead57 (diff) | |
update
| -rw-r--r-- | Annex.hs | 6 | ||||
| -rw-r--r-- | demo.log | 11 | ||||
| -rw-r--r-- | git-annex.mdwn | 4 |
3 files changed, 3 insertions, 18 deletions
@@ -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) diff --git a/demo.log b/demo.log deleted file mode 100644 index bdecb7d40..000000000 --- a/demo.log +++ /dev/null @@ -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 diff --git a/git-annex.mdwn b/git-annex.mdwn index dd0b3bc07..6852ed008 100644 --- a/git-annex.mdwn +++ b/git-annex.mdwn @@ -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 |