hgext/evolve.py
changeset 1118 fbc400c1b022
parent 1117 98f4e356a431
child 1120 9bc4857f573b
--- a/hgext/evolve.py	Thu Oct 02 14:16:32 2014 -0500
+++ b/hgext/evolve.py	Thu Oct 02 15:50:07 2014 -0500
@@ -2427,7 +2427,11 @@
         if 'obsmarkers' in stepsdone:
             return
         stepsdone.add('obsmarkers')
-    if pushop.ret == 0:
+    if util.safehasattr(pushop, 'cgresult'):
+        cgresult = pushop.cgresult
+    else:
+        cgresult = pushop.ret
+    if cgresult == 0:
         return
     pushop.ui.debug('try to push obsolete markers to remote\n')
     repo = pushop.repo