summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Upgrade.hs6
-rw-r--r--Version.hs2
2 files changed, 7 insertions, 1 deletions
diff --git a/Upgrade.hs b/Upgrade.hs
index 7469d9ba7..eba75bf58 100644
--- a/Upgrade.hs
+++ b/Upgrade.hs
@@ -31,10 +31,16 @@ upgrade = do
version <- getVersion
case version of
Just "0" -> upgradeFrom0
+ Just "1" -> upgradeFrom1
Nothing -> return True -- repo not initted yet, no version
Just v | v == currentVersion -> return True
Just _ -> error "this version of git-annex is too old for this git repository!"
+upgradeFrom1 :: Annex Bool
+upgradeFrom1 = do
+ showSideAction "Upgrading object directory layout..."
+ error "upgradeFrom1 TODO FIXME"
+
upgradeFrom0 :: Annex Bool
upgradeFrom0 = do
showSideAction "Upgrading object directory layout..."
diff --git a/Version.hs b/Version.hs
index 9e31d3c9e..7fdbd1a49 100644
--- a/Version.hs
+++ b/Version.hs
@@ -16,7 +16,7 @@ import qualified GitRepo as Git
import Locations
currentVersion :: String
-currentVersion = "1"
+currentVersion = "2"
versionField :: String
versionField = "annex.version"