Mercurial Mercurial > hg / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mercurial/cmdutil.py
changeset 22395 67588e47522a
parent 22386 54e614a297ac
child 22396 c0213f2cb942 
--- a/mercurial/cmdutil.py	Wed Sep 10 14:42:52 2014 +0100
+++ b/mercurial/cmdutil.py	Sat Aug 30 01:52:08 2014 +0200
@@ -2541,6 +2541,7 @@
         needdata = ('revert', 'add', 'undelete')
         _revertprefetch(repo, ctx, *[actions[name][0] for name in needdata])
 
+        wctx = repo[None]
         for abs, (rel, exact) in sorted(names.items()):
             # target file to be touch on disk (relative to cwd)
             target = repo.wjoin(abs)
@@ -2553,7 +2554,7 @@
                 if xlist is not None:
                     xlist.append(abs)
                     if (dobackup and os.path.lexists(target)
-                        and repo[None][abs].cmp(ctx[abs])):
+                        and wctx[abs].cmp(ctx[abs])):
                         bakname = "%s.orig" % rel
                         ui.note(_('saving current version of %s as %s\n') %
                                 (rel, bakname))
Mercurial