Mercurial > public > mercurial-scm > hg-stable

diff mercurial/context.py @ 12360:4ae3e5dffa60 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
context: fix filectx.undelete() (issue2388)
author Patrick Mezard <pmezard@gmail.com>
date Tue, 21 Sep 2010 23:14:58 +0200
parents b6173aee4a47
children 2754c8273132
line wrap: on
line diff
--- a/mercurial/context.py	Mon Sep 20 17:01:12 2010 -0500
+++ b/mercurial/context.py	Tue Sep 21 23:14:58 2010 +0200
@@ -843,7 +843,7 @@
                 if self._repo.dirstate[f] != 'r':
                     self._repo.ui.warn(_("%s not removed!\n") % f)
                 else:
-                    fctx = f in pctxs[0] and pctxs[0] or pctxs[1]
+                    fctx = f in pctxs[0] and pctxs[0][f] or pctxs[1][f]
                     t = fctx.data()
                     self._repo.wwrite(f, t, fctx.flags())
                     self._repo.dirstate.normal(f)