summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Upgrade/V2.hs15
-rw-r--r--debian/changelog4
2 files changed, 19 insertions, 0 deletions
diff --git a/Upgrade/V2.hs b/Upgrade/V2.hs
index df1f62b8c..c249e340b 100644
--- a/Upgrade/V2.hs
+++ b/Upgrade/V2.hs
@@ -17,6 +17,21 @@ import Messages
import Utility
import Locations
+{- .git-annex/ moved to a git-annex branch.
+ -
+ - Strategy:
+ -
+ - * Create the git-annex branch.
+ - * Find each location log file in .git-annex/, and inject its content
+ - into the git-annex branch, unioning with any content already in
+ - there. (in passing, this deals with the semi transition that left
+ - some location logs hashed two different ways; both are found and
+ - merged).
+ - * Also inject remote.log, trust.log, and uuid.log.
+ - * git rm -rf .git-annex
+ - * Remove stuff that used to be needed in .gitattributes.
+ - * Commit changes.
+ -}
upgrade :: Annex Bool
upgrade = do
showNote "v2 to v3"
diff --git a/debian/changelog b/debian/changelog
index 4543ef271..3fc7216e2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,10 @@ git-annex (3.20110611) UNRELEASED; urgency=low
* merge: New subcommand. Auto-merges the new git-annex branch.
* Improved handling of bare git repos with annexes. Many more commands will
work in them.
+ * Sped up many commands.
+ * git-annex is now more robust; it will never leave state files
+ uncommitted when some other git process comes along and locks the index
+ at an inconvenient time.
* rsync is now used when copying files from repos on other filesystems.
cp is still used when copying file from repos on the same filesystem,
since --reflink=auto can make it significantly faster on filesystems