diff options
author | Joey Hess <joeyh@joeyh.name> | 2015-12-27 15:59:59 -0400 |
---|---|---|
committer | Joey Hess <joeyh@joeyh.name> | 2015-12-27 15:59:59 -0400 |
commit | 60c88820987596809091ee010e6be2a083888bc8 (patch) | |
tree | dc2540c6deadfcf3efee1fd95948bcbd6f219db5 /Command/Lock.hs | |
parent | 17490f3685aee698e10555c5dc3e915a317c2250 (diff) |
annex.thin
Decided it's too scary to make v6 unlocked files have 1 copy by default,
but that should be available to those who need it. This is consistent with
git-annex not dropping unused content without --force, etc.
* Added annex.thin setting, which makes unlocked files in v6 repositories
be hard linked to their content, instead of a copy. This saves disk
space but means any modification of an unlocked file will lose the local
(and possibly only) copy of the old version.
* Enable annex.thin by default on upgrade from direct mode to v6, since
direct mode made the same tradeoff.
* fix: Adjusts unlocked files as configured by annex.thin.
Diffstat (limited to 'Command/Lock.hs')
-rw-r--r-- | Command/Lock.hs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Command/Lock.hs b/Command/Lock.hs index 1be6e9c76..3fbe33d8a 100644 --- a/Command/Lock.hs +++ b/Command/Lock.hs @@ -79,7 +79,7 @@ performNew file key filemodified = do unlessM (sameInodeCache obj (maybeToList mfc)) $ do modifyContent obj $ replaceFile obj $ \tmp -> do unlessM (checkedCopyFile key obj tmp) $ - error "unable to lock file; need more free disk space" + error "unable to lock file" Database.Keys.storeInodeCaches key [obj] -- Try to repopulate obj from an unmodified associated file. |