# HG changeset patch
# User Martin von Zweigbergk <martinvonz@google.com>
# Date 1555693419 25200
# Node ID 3a3be137863426e6585e72ce205aeb459550acae
# Parent  fed1435757baf436e9ca667fe63054d091f23ee4
evolve: increment progress *after* a whole merge commit is done

The "re-stabilize" step was using the progress that was supposed to be
for the next revision.

diff -r fed1435757ba -r 3a3be1378634 hgext3rd/evolve/evolvecmd.py
--- a/hgext3rd/evolve/evolvecmd.py	Fri Apr 19 11:02:35 2019 -0700
+++ b/hgext3rd/evolve/evolvecmd.py	Fri Apr 19 10:03:39 2019 -0700
@@ -1738,7 +1738,6 @@
             ret = _solveone(ui, repo, curctx, evolvestate, dryrunopt,
                             confirmopt, progresscb, targetcat,
                             lastsolved=lastsolved, stacktmplt=stacktmplt)
-            seen += 1
             if ret[0]:
                 evolvestate['replacements'][curctx.node()] = ret[1]
                 lastsolved = ret[1]
@@ -1758,6 +1757,7 @@
                     evolvestate['skippedrevs'].append(curctx.node())
 
                 evolvestate['orphanmerge'] = False
+            seen += 1
 
     progresscb()
     _cleanup(ui, repo, startnode, showprogress, shouldupdate)