summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Version.hs4
-rw-r--r--doc/upgrades.mdwn4
2 files changed, 6 insertions, 2 deletions
diff --git a/Version.hs b/Version.hs
index 947af8cef..72d06f663 100644
--- a/Version.hs
+++ b/Version.hs
@@ -20,13 +20,13 @@ import Config
type Version = String
defaultVersion :: Version
-defaultVersion = "2"
+defaultVersion = "3"
supportedVersions :: [Version]
supportedVersions = [defaultVersion]
upgradableVersions :: [Version]
-upgradableVersions = ["0", "1"]
+upgradableVersions = ["0", "1", "2"]
versionField :: String
versionField = "annex.version"
diff --git a/doc/upgrades.mdwn b/doc/upgrades.mdwn
index 0a07ef7aa..516e5b3bb 100644
--- a/doc/upgrades.mdwn
+++ b/doc/upgrades.mdwn
@@ -45,6 +45,10 @@ Example upgrade process:
## Upgrade events, so far
+### v2 -> v3 (git-annex version 0.20110610 to version 0.20110622)
+
+Involved moving the .git-annex/ directory into a separate git-annex branch.
+
### v1 -> v2 (git-annex version 0.23 to version 0.20110316)
Involved adding hashing to .git/annex/ and changing the names of all keys.