Mercurial > public > mercurial-scm > hg
diff mercurial/context.py @ 12361:2754c8273132
Merge with stable
| author | Patrick Mezard <pmezard@gmail.com> |
|---|---|
| date | Tue, 21 Sep 2010 23:37:47 +0200 |
| parents | e0ee3e822a9a 4ae3e5dffa60 |
| children | 4147a292c508 |
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:37:47 2010 +0200 @@ -844,7 +844,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)