mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merge branch 'master' of ssh://git-annex.branchable.com

Browse source
This commit is contained in:
Joey Hess 2016-01-14 17:57:05 -04:00
commit d3ff430a04
Failed to extract signature
2 changed files with 17 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
doc/news/version_6.20160114/comment_1_756c63fc0fef191444df98923b4df852._comment Normal file
View file

@ -0,0 +1,7 @@
[[!comment format=mdwn
username="db48x"
subject="hexapodia!"
date="2016-01-14T21:38:57Z"
content="""
:D
"""]]

12
doc/upgrades.mdwn
View file

@ -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