# HG changeset patch
# User Augie Fackler <raf@durin42.com>
# Date 1384713744 18000
# Node ID 2e22f30e843709738c19102a0516651edb7ab3b0
# Parent  4b06b2a445a1cc6a1efd774b774bb58e68ac334a# Parent  28445179df90b3cf849d97aed03f15c5661e26f3
Merge with stable.

diff -r 4b06b2a445a1 -r 2e22f30e8437 mercurial/obsolete.py
--- a/mercurial/obsolete.py	Fri Nov 08 12:45:52 2013 +0900
+++ b/mercurial/obsolete.py	Sun Nov 17 13:42:24 2013 -0500
@@ -267,7 +267,8 @@
         Return the number of new marker."""
         if not _enabled:
             raise util.Abort('obsolete feature is not enabled on this repo')
-        new = [m for m in markers if m not in self._all]
+        known = set(self._all)
+        new = [m for m in markers if m not in known]
         if new:
             f = self.sopener('obsstore', 'ab')
             try: