init --version=6 upgrade to 8 not yet 10

autoUpgradeableVersions had latestVersion (10), but it did not make
sense for asking for old version 6 to get version 10, while asking for
version 8 got version 8. So use defaultVersion (8) instead.

Sponsored-by: Dartmouth College's Datalad project

diff --git a/Annex/Version.hs b/Annex/Version.hs
index 7f604fefc9b49b0d33780d0b8aa7a10e718557e7..6a1dcdf99cdeb9ec9397af04540e490c81a2cdbb 100644 (file)
--- a/Annex/Version.hs
+++ b/Annex/Version.hs
@@ -36,13 +36,13 @@ upgradeableVersions = map RepoVersion [2..10]
 
 autoUpgradeableVersions :: M.Map RepoVersion RepoVersion
 autoUpgradeableVersions = M.fromList
-       [ (RepoVersion 3, latestVersion)
-       , (RepoVersion 4, latestVersion)
-       , (RepoVersion 5, latestVersion)
-       , (RepoVersion 6, latestVersion)
-       , (RepoVersion 7, latestVersion)
-       , (RepoVersion 8, latestVersion) 
-       , (RepoVersion 9, latestVersion) 
+       [ (RepoVersion 3, defaultVersion)
+       , (RepoVersion 4, defaultVersion)
+       , (RepoVersion 5, defaultVersion)
+       , (RepoVersion 6, defaultVersion)
+       , (RepoVersion 7, defaultVersion)
+       , (RepoVersion 8, defaultVersion)
+       , (RepoVersion 9, defaultVersion)
        ]
 
 versionField :: ConfigKey

diff --git a/doc/bugs/init__58___autoupgrade___60__8_annex_version_to_8_not_10.mdwn b/doc/bugs/init__58___autoupgrade___60__8_annex_version_to_8_not_10.mdwn
index c2dc5b9420d2c41ff6136ee5df4d2e140d2c80d8..e2072e1287d18b121b8fe997d11abc598fb3e7c3 100644 (file)
--- a/doc/bugs/init__58___autoupgrade___60__8_annex_version_to_8_not_10.mdwn
+++ b/doc/bugs/init__58___autoupgrade___60__8_annex_version_to_8_not_10.mdwn
@@ -65,3 +65,5 @@ supported repository versions: 8 9 10
 upgrade supported from repository versions: 0 1 2 3 4 5 6 7 8 9 10
 local repository version: 8
 ```
+
+> [[fixed|done]] --[[Joey]]

diff --git a/doc/bugs/init__58___autoupgrade___60__8_annex_version_to_8_not_10/comment_2_419bf4e6ebce4bcaae3afc6420da80b8._comment b/doc/bugs/init__58___autoupgrade___60__8_annex_version_to_8_not_10/comment_2_419bf4e6ebce4bcaae3afc6420da80b8._comment
new file mode 100644 (file)
index 0000000..47f4635
--- /dev/null
+++ b/doc/bugs/init__58___autoupgrade___60__8_annex_version_to_8_not_10/comment_2_419bf4e6ebce4bcaae3afc6420da80b8._comment
@@ -0,0 +1,10 @@
+[[!comment format=mdwn
+ username="joey"
+ subject="""comment 2"""
+ date="2022-01-25T17:42:32Z"
+ content="""
+Scratch that about `git-annex init --version`; v8 does not automatically
+upgrade to v10 yet, so why should v6? I agree that seems like a bug.
+
+fixed
+"""]]