summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog3
-rw-r--r--git-annex.cabal2
2 files changed, 4 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index ed52e7ad9..e83a7f518 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -27,6 +27,9 @@ git-annex (5.20140718) UNRELEASED; urgency=medium
due to the nature of bup.
* unlock: Better error handling; continue past files that are not available
or cannot be unlocked due to disk space, and try all specified files.
+ * Windows: Now uses actual inode equivilants in new direct mode
+ repositories, for safer detection of eg, renaming of files with the same
+ size and mtime.
-- Joey Hess <joeyh@debian.org> Mon, 21 Jul 2014 14:41:26 -0400
diff --git a/git-annex.cabal b/git-annex.cabal
index 5154b27dd..097fee4cb 100644
--- a/git-annex.cabal
+++ b/git-annex.cabal
@@ -111,7 +111,7 @@ Executable git-annex
GHC-Options: -O2
if (os(windows))
- Build-Depends: Win32, Win32-extras
+ Build-Depends: Win32, Win32-extras, unix-compat (>= 0.4.1.3)
C-Sources: Utility/winprocess.c
else
Build-Depends: unix