diff options
| author |  Joey Hess <joey@kitenet.net> | 2012-12-18 15:04:44 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2012-12-18 15:04:44 -0400 |
| commit | 10d77d95f454a2fb2806c031a14344dd7cdea006 (patch) | |
| tree | b9ba63e2f844031d4fd1d8248e5b01e7b5be7902 /Locations.hs | |
| parent | 19e46a374225bc37131454774f20da4c6a7779d9 (diff) | |
direct mode merging works!
Automatic merge resoltion code needs to be fixed to preserve objects from
direct mode files.
Diffstat (limited to 'Locations.hs')
| -rw-r--r-- | Locations.hs | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/Locations.hs b/Locations.hs index cfe9bd27d..ce867fac5 100644 --- a/Locations.hs +++ b/Locations.hs @@ -25,6 +25,7 @@ module Locations ( gitAnnexFsckState, gitAnnexTransferDir, gitAnnexCredsDir, + gitAnnexMergeDir, gitAnnexJournalDir, gitAnnexJournalLock, gitAnnexIndex, @@ -161,6 +162,10 @@ gitAnnexFsckState r = gitAnnexDir r </> "fsckstate" gitAnnexCredsDir :: Git.Repo -> FilePath gitAnnexCredsDir r = addTrailingPathSeparator $ gitAnnexDir r </> "creds" +{- .git/annex/merge/ is used for direct mode merges. -} +gitAnnexMergeDir :: Git.Repo -> FilePath +gitAnnexMergeDir r = addTrailingPathSeparator $ gitAnnexDir r </> "merge" + {- .git/annex/transfer/ is used to record keys currently - being transferred, and other transfer bookkeeping info. -} gitAnnexTransferDir :: Git.Repo -> FilePath |