# HG changeset patch # User Pierre-Yves David # Date 1409356262 -7200 # Node ID 4509a16c76c2f5368920abc37165fe8d6eb5317b # Parent f6a1386d540e8d45baf3d7072f430094950e2820 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. diff -r f6a1386d540e -r 4509a16c76c2 mercurial/cmdutil.py --- 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))