From 9a765b7bd8ca28e3f94d9d7a11ce4d7162f700f1 Mon Sep 17 00:00:00 2001
From: Joey Hess <joeyh@joeyh.name>
Date: Fri, 4 Dec 2015 16:14:48 -0400
Subject: add v6; keep v5 working for now and manual upgrade

Since all places where a repo is used in direct mode need to have git-annex
upgraded before the repo can safely be converted to v6, the upgrade needs
to be manual for now.

I suppose that at some point I'll want to drop all the direct mode support
code. At that point, will stop supporting v5, and will need to auto-upgrade
any remaining v5 repos. If possible, I'd like to carry the direct mode
support for say, a year or so, to give people plenty of time to upgrade and
avoid disruption.
---
 Upgrade/V1.hs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'Upgrade/V1.hs')

diff --git a/Upgrade/V1.hs b/Upgrade/V1.hs
index 801cdafa0..bcf7e0b6d 100644
--- a/Upgrade/V1.hs
+++ b/Upgrade/V1.hs
@@ -54,14 +54,14 @@ upgrade = do
 	ifM (fromRepo Git.repoIsLocalBare)
 		( do
 			moveContent
-			setVersion supportedVersion
+			setVersion currentVersion
 		, do
 			moveContent
 			updateSymlinks
 			moveLocationLogs
 	
 			Annex.Queue.flush
-			setVersion supportedVersion
+			setVersion currentVersion
 		)
 	
 	Upgrade.V2.upgrade
-- 
cgit v1.2.3