Mercurial Mercurial > pub > hg > evolve / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
evolve: adapt to core changeset 4f14303e8954
authorPierre-Yves David <pierre-yves.david@fb.com>
Thu, 02 Oct 2014 15:50:07 -0500
changeset 1118 fbc400c1b022
parent 1117 98f4e356a431
child 1119 7068ccfed963
evolve: adapt to core changeset 4f14303e8954 pushop.ret is now pushop.cgresult
hgext/evolve.py file | annotate | diff | comparison | revisions 
--- 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
evolve