diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2016-01-14 17:57:05 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2016-01-14 17:57:05 -0400 |
| commit | 864eefaee27750604392d2ab87c5beb12f0f7a04 (patch) | |
| tree | 98354dcc8ddbc166286eaed907b5ddd4c90414c5 | |
| parent | 09973ef89e8ed98bf520b2956c05aa83db786ca9 (diff) | |
| parent | fce9880712488bf75333503b50545c9a10a72091 (diff) | |
Merge branch 'master' of ssh://git-annex.branchable.com
| -rw-r--r-- | doc/news/version_6.20160114/comment_1_756c63fc0fef191444df98923b4df852._comment | 7 | ||||
| -rw-r--r-- | doc/upgrades.mdwn | 12 |
2 files changed, 17 insertions, 2 deletions
diff --git a/doc/news/version_6.20160114/comment_1_756c63fc0fef191444df98923b4df852._comment b/doc/news/version_6.20160114/comment_1_756c63fc0fef191444df98923b4df852._comment new file mode 100644 index 000000000..dde699d2f --- /dev/null +++ b/doc/news/version_6.20160114/comment_1_756c63fc0fef191444df98923b4df852._comment @@ -0,0 +1,7 @@ +[[!comment format=mdwn + username="db48x" + subject="hexapodia!" + date="2016-01-14T21:38:57Z" + content=""" +:D +"""]] 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 |