summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2011-06-23 11:46:55 -0400
committerGravatar Joey Hess <joey@kitenet.net>2011-06-23 11:46:55 -0400
commit224a8098b5cc27a78b31094026e545137781b27e (patch)
tree1a4131e14cf56823b9311335c92bc57c90a64f61
parent5f494154a34bad7cc54915a2a408b830e8ca77be (diff)
v3 upgrade is fast!
The journal sped this up approximatly 100-fold; it runs in just a few minutes for a large repository with 30 thousand log files.
-rw-r--r--doc/upgrades.mdwn11
1 files changed, 6 insertions, 5 deletions
diff --git a/doc/upgrades.mdwn b/doc/upgrades.mdwn
index 2e8f201fb..509e29695 100644
--- a/doc/upgrades.mdwn
+++ b/doc/upgrades.mdwn
@@ -9,8 +9,7 @@ git-annex, and might want to use them with a newer git-annex.
git-annex will notice if it is run in a repository that
needs an upgrade, and refuse to do anything. To upgrade,
-use the "git annex upgrade" command. The upgrade can tend
-to take a while, if you have a lot of files.
+use the "git annex upgrade" command.
The upgrade process is guaranteed to be conflict-free. Unless you
already have git conflicts in your repository or between repositories.
@@ -25,9 +24,9 @@ Involved moving the .git-annex/ directory into a separate git-annex branch.
### tips for this upgrade
-This upgrade is easier 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.
+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.
@@ -50,6 +49,8 @@ To ensure that information is available for all your annexed files, see
### tips for this upgrade
+This upgrade can tend to take a while, if you have a lot of files.
+
Each clone of a repository should be individually upgraded.
Until a repository's remotes have been upgraded, git-annex
will refuse to communicate with them.