improve post-upgrade push instructions

3 files changed, 14 insertions, 6 deletions

diff --git a/Upgrade/V2.hs b/Upgrade/V2.hs
index 7e4cfb13a..9d32764e7 100644
--- a/Upgrade/V2.hs
+++ b/Upgrade/V2.hs
@@ -50,6 +50,11 @@ upgrade = do
 	liftIO $ do
 		Git.run g "rm" [Param "-r", Param "-f", Param "-q", File olddir]
 		gitAttributesUnWrite g
+
+	showLongNote $
+		"git-annex branch created\n" ++
+		"Now you should push the new branch: git push origin git-annex"
+
 	return True
 
 locationLogs :: Git.Repo -> Annex [(Key, FilePath)]
diff --git a/debian/NEWS b/debian/NEWS
index 00531d41b..4218bf568 100644
--- a/debian/NEWS
+++ b/debian/NEWS
@@ -2,7 +2,8 @@ git-annex (3.20110622) unstable; urgency=low
 
   There has been another change to the git-annex data store.
   Use `git annex upgrade` to migrate your repositories to the new
-  layout.
+  layout. See <http://git-annex.branchable.com/upgrades/> or
+  /usr/share/doc/git-annex/html/upgrades.html
 
   The significant change this time is that the .git-annex/ directory
   is gone; instead there is a git-annex branch that is automatically
diff --git a/doc/upgrades.mdwn b/doc/upgrades.mdwn
index 1813d079a..f83a8c947 100644
--- a/doc/upgrades.mdwn
+++ b/doc/upgrades.mdwn
@@ -27,13 +27,15 @@ Involved moving the .git-annex/ directory into a separate git-annex branch.
 This upgrade is easier (and faster!) than the previous upgrades.
 You don't need to upgrade every repository at once; it's sufficient
 to upgrade each repository only when you next use it.
-
-After the upgrade is complete, commit the changes it staged.
 	
-	git commit -m "upgrade v2 to v3"
+Example upgrade process:
 
-Running `git gc` after this upgrade will likely free up significant disk 
-space. (Tens to hundreds of megabytes.)
+	cd localrepo
+	git pull
+	git annex upgrade
+	git commit -m "upgrade v2 to v3"
+	git push origin git-annex master
+	git gc
 
 ### v1 -> v2 (git-annex version 0.20110316)