aboutsummaryrefslogtreecommitdiff
path: root/doc/upgrades.mdwn
diff options
context:
space:
mode:
authorGravatar anarcat <anarcat@web>2016-01-14 21:21:36 +0000
committerGravatar admin <admin@branchable.com>2016-01-14 21:21:36 +0000
commitf65f2dde2d609edb32abdf24de081eaaf8149877 (patch)
treeef3f8a44e4ed585bc836ae2c348385a63eb974c3 /doc/upgrades.mdwn
parente3988a7855e0abe5880f0c1eb8d0c7ff111e8ec0 (diff)
add references to annex.thin in the upgrade docs
Diffstat (limited to 'doc/upgrades.mdwn')
-rw-r--r--doc/upgrades.mdwn12
1 files changed, 10 insertions, 2 deletions
diff --git a/doc/upgrades.mdwn b/doc/upgrades.mdwn
index b3deab715..fd4accc69 100644
--- a/doc/upgrades.mdwn
+++ b/doc/upgrades.mdwn
@@ -46,7 +46,7 @@ The upgrade events, so far:
## v5 -> v6 (git-annex version 6.x)
The upgrade from v5 to v6 is handled manually. Run `git-annex upgrade`
-perform the upgrade.
+performs the upgrade.
Warning: All places that a direct mode repository is cloned to should be
running git-annex version 6.x before you upgrade the repository.
@@ -72,13 +72,21 @@ The behavior of some commands changes in an upgraded repository:
* `git annex unlock` and `git annex lock` change how the pointer to
the annexed content is stored in git.
+There is also a new `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.
+
On upgrade, all files in a direct mode repository will be converted to
-unlocked files. The upgrade will stage changes to all annexed files in
+unlocked files with the `annex.thin` setting enabled.
+The upgrade will stage changes to all annexed files in
the git repository, which you can then commit.
If a repository has some clones using direct mode and some using indirect
mode, all the files will end up unlocked in all clones after the upgrade.
+See [[tips/unlocked_files/]] for more details about locked files and thin mode.
+
## v4 -> v5 (git-annex version 5.x)
The upgrade from v4 to v5 is handled