Mercurial > hg-stable

changeset 24164:07a92bbd02e5 stable 3.3.2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
transaction: really disable hardlink backups (issue4546)
author Matt Harbison <matt_harbison@yahoo.com>
date Mon, 02 Mar 2015 10:31:22 -0500
parents 80af610c4ffb
children ecac1dc63464
files mercurial/util.py tests/test-hardlinks.t
diffstat 2 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/util.py	Mon Mar 02 01:06:31 2015 -0600
+++ b/mercurial/util.py	Mon Mar 02 10:31:22 2015 -0500
@@ -722,7 +722,7 @@
         unlink(dest)
     # hardlinks are problematic on CIFS, quietly ignore this flag
     # until we find a way to work around it cleanly (issue4546)
-    if False or hardlink:
+    if False and hardlink:
         try:
             oslink(src, dest)
             return
--- a/tests/test-hardlinks.t	Mon Mar 02 01:06:31 2015 -0600
+++ b/tests/test-hardlinks.t	Mon Mar 02 10:31:22 2015 -0500
@@ -159,7 +159,7 @@
   1 r2/.hg/store/00manifest.i
   1 r2/.hg/store/data/d1/f2.i
   2 r2/.hg/store/data/f1.i
-  2 r2/.hg/store/fncache
+  1 r2/.hg/store/fncache
 
   $ hg -R r2 verify
   checking changesets
@@ -184,7 +184,7 @@
   1 r2/.hg/store/00manifest.i
   1 r2/.hg/store/data/d1/f2.i
   1 r2/.hg/store/data/f1.i
-  2 r2/.hg/store/fncache
+  1 r2/.hg/store/fncache
 
 
   $ cd r3