# HG changeset patch # User Augie Fackler # Date 1413582232 14400 # Node ID 7a1784a1c64265e32f4381e47d2bdc0f5b6de0cf # Parent a44a26f8cc48e2b9d5406d904c2120933e9f6bcc pullobsolete: handle migration from todosteps to donesteps This make evolve compatible with change made in Mercurial (92bf9abc4deb) diff --git a/hgext/evolve.py b/hgext/evolve.py --- a/hgext/evolve.py +++ b/hgext/evolve.py @@ -2591,7 +2591,9 @@ def _pullobsolete(orig, pullop): if not obsolete._enabled: return None - if 'obsmarkers' not in pullop.todosteps: + if 'obsmarkers' not in getattr(pullop, 'todosteps', ['obsmarkers']): + return None + if 'obsmarkers' in getattr(pullop, 'stepsdone', []): return None wirepull = pullop.remote.capable('_evoext_pullobsmarkers_0') if not wirepull: