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

fix autoupgrade from v6 to go to v7, not v5

Browse source 
v3 and v4 still autoupgrade to v5

And a few more upgrade doc updates.
This commit is contained in:
Joey Hess 2018-10-25 18:33:34 -04:00
parent 234842a347
commit b996b38b4f
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
4 changed files with 25 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Annex/Version.hs
View file

@ -14,6 +14,8 @@ import Config
import Types.RepoVersion
import qualified Annex
import qualified Data.Map as M
defaultVersion :: RepoVersion
defaultVersion = RepoVersion 5
@ -33,8 +35,12 @@ upgradableVersions = map RepoVersion [0..6]
upgradableVersions = map RepoVersion [2..6]
#endif
autoUpgradeableVersions :: [RepoVersion]
autoUpgradeableVersions = map RepoVersion [3, 4, 6]
autoUpgradeableVersions :: M.Map RepoVersion RepoVersion
autoUpgradeableVersions = M.fromList
[ (RepoVersion 3, RepoVersion 5)
, (RepoVersion 4, RepoVersion 5)
, (RepoVersion 6, RepoVersion 7)
]
versionField :: ConfigKey
versionField = annexConfig "version"