Mercurial > hg > mercurial-crew-with-dirclash

diff mercurial/context.py @ 3240:8d4855fd9d7b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: use new working context object in update
author Matt Mackall <mpm@selenic.com>
date Tue, 03 Oct 2006 01:21:46 -0500
parents 6d98149d70fe
children a184cd0c2db9
line wrap: on
line diff
--- a/mercurial/context.py
+++ b/mercurial/context.py
@@ -342,7 +342,7 @@ class workingctx(changectx):
     def _buildmanifest(self):
         """generate a manifest corresponding to the working directory"""
 
-        man = self._parents[0].manifest().coy()
+        man = self._parents[0].manifest().copy()
         copied = self._repo.dirstate.copies()
         modified, added, removed, deleted, unknown = self._status[:5]
         for i,l in (("a", added), ("m", modified), ("u", unknown)):