summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2012-10-16 16:47:59 -0400
committerGravatar Joey Hess <joey@kitenet.net>2012-10-16 16:47:59 -0400
commit30beb3b747088f8cbe02fe217b38d0105873bb0e (patch)
tree236e4fc5b87b7d000869d45e457d898eb5a6ebd1
parent98207655a35819f2f4b46c96712cb8b0dadac570 (diff)
releasing version 3.201210163.20121016
-rw-r--r--Utility/Directory.hs2
-rw-r--r--debian/changelog4
-rw-r--r--doc/design/assistant/transfer_control.mdwn6
-rw-r--r--git-annex.cabal2
4 files changed, 9 insertions, 5 deletions
diff --git a/Utility/Directory.hs b/Utility/Directory.hs
index cf72952d6..74d61e25d 100644
--- a/Utility/Directory.hs
+++ b/Utility/Directory.hs
@@ -10,7 +10,7 @@ module Utility.Directory where
import System.IO.Error
import System.Posix.Files
import System.Directory
-import Control.Exception (throw, bracket_)
+import Control.Exception (throw)
import Control.Monad
import Control.Monad.IfElse
import System.FilePath
diff --git a/debian/changelog b/debian/changelog
index e7797dd84..3274a3733 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-git-annex (3.20121011) UNRELEASED; urgency=low
+git-annex (3.20121016) unstable; urgency=low
* vicfg: New file format, avoids ambiguity with repos that have the same
description, or no description.
@@ -16,7 +16,7 @@ git-annex (3.20121011) UNRELEASED; urgency=low
* Temporarily disable use of dbus, as the haskell dbus library blows up
when losing connection, which will need to be fixed upstream.
- -- Joey Hess <joeyh@debian.org> Fri, 12 Oct 2012 22:46:08 -0400
+ -- Joey Hess <joeyh@debian.org> Tue, 16 Oct 2012 15:25:22 -0400
git-annex (3.20121010) unstable; urgency=low
diff --git a/doc/design/assistant/transfer_control.mdwn b/doc/design/assistant/transfer_control.mdwn
index 614d384bb..6348ab229 100644
--- a/doc/design/assistant/transfer_control.mdwn
+++ b/doc/design/assistant/transfer_control.mdwn
@@ -8,7 +8,11 @@ But often the remote is just a removable drive or a cloud remote,
that has a limited size. This page is about making the assistant do
something smart with such remotes.
-## dropping no longer preferred content TODO
+## TODO
+
+* preferred content settings made in the webapp (or in vicfg, or synced over) are not noticed.
+
+### dropping no longer preferred content TODO
When a file is renamed, it might stop being preferred, so
could be checked and dropped. (If there's multiple links to
diff --git a/git-annex.cabal b/git-annex.cabal
index 7d4603b51..5f284fb89 100644
--- a/git-annex.cabal
+++ b/git-annex.cabal
@@ -1,5 +1,5 @@
Name: git-annex
-Version: 3.20121010
+Version: 3.20121016
Cabal-Version: >= 1.8
License: GPL
Maintainer: Joey Hess <joey@kitenet.net>