Mercurial > hg

changeset 38871:204e074c188e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
narrow: drop checkambig=True when restoring backup IIUC, checkambig is about updating timestamps of the file while renaming. That's important for the dirstate, but we never check the timestamp of the narrowspec file. We can therefore avoid checking passing checkambig=True. Differential Revision: https://phab.mercurial-scm.org/D4098
author Martin von Zweigbergk <martinvonz@google.com>
date Fri, 03 Aug 2018 13:53:02 -0700
parents ae2962bb56a3
children 576eef1ab43d
files mercurial/narrowspec.py
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/narrowspec.py	Thu Aug 02 14:30:40 2018 -0700
+++ b/mercurial/narrowspec.py	Fri Aug 03 13:53:02 2018 -0700
@@ -137,7 +137,7 @@
 def restorebackup(repo, backupname):
     if repository.NARROW_REQUIREMENT not in repo.requirements:
         return
-    repo.vfs.rename(backupname, FILENAME, checkambig=True)
+    repo.vfs.rename(backupname, FILENAME)
 
 def clearbackup(repo, backupname):
     if repository.NARROW_REQUIREMENT not in repo.requirements: