Mercurial Mercurial > hg-stable / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
revert: drop now useless conditional in the backup check
authorPierre-Yves David <pierre-yves.david@fb.com>
Sat, 30 Aug 2014 01:51:02 +0200
changeset 22374 4509a16c76c2
parent 22373 f6a1386d540e
child 22375 308ab71207ff
revert: drop now useless conditional in the backup check Now that we removed the (hopeless) attempt to backup file we knew to be missing in the target changeset, we can stop checking if the file exists in the target changeset.
mercurial/cmdutil.py file | annotate | diff | comparison | revisions 
--- a/mercurial/cmdutil.py	Sat Aug 30 01:49:28 2014 +0200
+++ b/mercurial/cmdutil.py	Sat Aug 30 01:51:02 2014 +0200
@@ -2551,8 +2551,8 @@
                     continue
                 if xlist is not None:
                     xlist.append(abs)
-                    if (dobackup and os.path.lexists(target) and
-                        abs in ctx and repo[None][abs].cmp(ctx[abs])):
+                    if (dobackup and os.path.lexists(target)
+                        and repo[None][abs].cmp(ctx[abs])):
                         bakname = "%s.orig" % rel
                         ui.note(_('saving current version of %s as %s\n') %
                                 (rel, bakname))
hg-stable