# HG changeset patch
# User Sune Foldager <cryo@cyanite.org>
# Date 1308560921 -7200
# Node ID b1880474e3adb25d2242cb00005b872ce67e85b2
# Parent  c67c41af264ccee43cbae2b830ebb1f9c4007253# Parent  5fb3cb7266e5dab94207de980cfdca0e82cdb813
merge with stable

diff -r c67c41af264c -r b1880474e3ad mercurial/config.py
--- a/mercurial/config.py	Mon Jun 20 10:42:19 2011 +0200
+++ b/mercurial/config.py	Mon Jun 20 11:08:41 2011 +0200
@@ -27,6 +27,9 @@
     def update(self, src):
         for k in src:
             self[k] = src[k]
+    def clear(self):
+        dict.clear(self)
+        self._list = []
     def items(self):
         return [(k, self[k]) for k in self._list]
     def __delitem__(self, key):
diff -r c67c41af264c -r b1880474e3ad mercurial/patch.py
--- a/mercurial/patch.py	Mon Jun 20 10:42:19 2011 +0200
+++ b/mercurial/patch.py	Mon Jun 20 11:08:41 2011 +0200
@@ -1378,7 +1378,7 @@
             cwd = repo.getcwd()
             if cwd:
                 cfiles = [util.pathto(repo.root, cwd, f)
-                          for f in cfile]
+                          for f in cfiles]
             scmutil.addremove(repo, cfiles, similarity=similarity)
     code = fp.close()
     if code: