Patchwork [STABLE] transaction: really disable hardlink backups (issue4546)

login
register
mail settings
Submitter Matt Harbison
Date March 2, 2015, 3:35 p.m.
Message ID <e8ea1900d242b85f112a.1425310509@MATT7H-PC.attotech.com>
Download mbox | patch
Permalink /patch/7878/
State Accepted
Commit 07a92bbd02e5e3a625e0820389b47786b02b2cea
Headers show

Comments

Matt Harbison - March 2, 2015, 3:35 p.m.
# HG changeset patch
# User Matt Harbison <matt_harbison@yahoo.com>
# Date 1425310282 18000
#      Mon Mar 02 10:31:22 2015 -0500
# Branch stable
# Node ID e8ea1900d242b85f112afbce8b1b4a1f260b7d75
# Parent  80af610c4ffbf42240dbd08458a546a009d6a58f
transaction: really disable hardlink backups (issue4546)
Matt Mackall - March 2, 2015, 4:19 p.m.
On Mon, 2015-03-02 at 10:35 -0500, Matt Harbison wrote:
> # HG changeset patch
> # User Matt Harbison <matt_harbison@yahoo.com>
> # Date 1425310282 18000
> #      Mon Mar 02 10:31:22 2015 -0500
> # Branch stable
> # Node ID e8ea1900d242b85f112afbce8b1b4a1f260b7d75
> # Parent  80af610c4ffbf42240dbd08458a546a009d6a58f
> transaction: really disable hardlink backups (issue4546)

Ugh. Queued for stable, thanks. I should not be fixing neglected
critical bugs at 1am on a Sunday night. Guess I'll spin a 3.3.2.

Patch

diff --git a/mercurial/util.py b/mercurial/util.py
--- a/mercurial/util.py
+++ b/mercurial/util.py
@@ -722,7 +722,7 @@  def copyfile(src, dest, hardlink=False):
         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