--- a/mercurial/util.py	Fri Sep 26 12:51:55 2014 -0700
+++ b/mercurial/util.py	Thu Oct 02 12:39:37 2014 -0500
@@ -252,6 +252,12 @@
     def __delitem__(self, key):
         dict.__delitem__(self, key)
         self._list.remove(key)
+    def pop(self, key, *args, **kwargs):
+        dict.pop(self, key, *args, **kwargs)
+        try:
+            self._list.remove(key)
+        except ValueError:
+            pass
     def keys(self):
         return self._list
     def iterkeys(self):