Mercurial > hg-stable
changeset 20029:2e22f30e8437
Merge with stable.
| author | Augie Fackler <raf@durin42.com> |
|---|---|
| date | Sun, 17 Nov 2013 13:42:24 -0500 |
| parents | 4b06b2a445a1 (current diff) 28445179df90 (diff) |
| children | 5931489b65e0 |
| files | |
| diffstat | 1 files changed, 2 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- 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: