hgext/evolve.py
changeset 1132 7a1784a1c642
parent 1131 a44a26f8cc48
child 1134 7173c70ab2c3
--- a/hgext/evolve.py	Thu Oct 16 04:38:37 2014 -0700
+++ b/hgext/evolve.py	Fri Oct 17 17:43:52 2014 -0400
@@ -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: