improve post-upgrade push instructions

This commit is contained in:
Joey Hess 2011-06-23 14:49:21 -04:00
parent 7ee636f6dd
commit 068703c405
3 changed files with 14 additions and 6 deletions

View file

@ -50,6 +50,11 @@ upgrade = do
liftIO $ do liftIO $ do
Git.run g "rm" [Param "-r", Param "-f", Param "-q", File olddir] Git.run g "rm" [Param "-r", Param "-f", Param "-q", File olddir]
gitAttributesUnWrite g gitAttributesUnWrite g
showLongNote $
"git-annex branch created\n" ++
"Now you should push the new branch: git push origin git-annex"
return True return True
locationLogs :: Git.Repo -> Annex [(Key, FilePath)] locationLogs :: Git.Repo -> Annex [(Key, FilePath)]

3
debian/NEWS vendored
View file

@ -2,7 +2,8 @@ git-annex (3.20110622) unstable; urgency=low
There has been another change to the git-annex data store. There has been another change to the git-annex data store.
Use `git annex upgrade` to migrate your repositories to the new 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 The significant change this time is that the .git-annex/ directory
is gone; instead there is a git-annex branch that is automatically is gone; instead there is a git-annex branch that is automatically

View file

@ -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. This upgrade is easier (and faster!) than the previous upgrades.
You don't need to upgrade every repository at once; it's sufficient You don't need to upgrade every repository at once; it's sufficient
to upgrade each repository only when you next use it. 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 cd localrepo
space. (Tens to hundreds of megabytes.) 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) ### v1 -> v2 (git-annex version 0.20110316)