diff --git a/hgext3rd/evolve/cmdrewrite.py b/hgext3rd/evolve/cmdrewrite.py
index 4ac6ca50bb2ec045d58a65d06bd170a94518f9df_aGdleHQzcmQvZXZvbHZlL2NtZHJld3JpdGUucHk=..10ccdee05ec0a156abe94750c8f0fa3e0f22e813_aGdleHQzcmQvZXZvbHZlL2NtZHJld3JpdGUucHk= 100644
--- a/hgext3rd/evolve/cmdrewrite.py
+++ b/hgext3rd/evolve/cmdrewrite.py
@@ -1430,7 +1430,5 @@
         raise error.Abort(_(b"no interrupted pick state exists"))
     pickstate.load()
     pctxnode = pickstate[b'oldpctx']
-    ui.status(_(b"aborting pick, updating to %s\n") %
-              node.short(pctxnode))
     compat.clean_update(repo[pctxnode])
     pickstate.delete()
@@ -1435,5 +1433,8 @@
     compat.clean_update(repo[pctxnode])
     pickstate.delete()
+    ui.status(_(b'pick aborted\n'))
+    ui.status(_(b'working directory is now at %s\n')
+              % node.short(pctxnode))
     return 0
 
 def hgabortpick(ui, repo):
diff --git a/tests/test-pick.t b/tests/test-pick.t
index 4ac6ca50bb2ec045d58a65d06bd170a94518f9df_dGVzdHMvdGVzdC1waWNrLnQ=..10ccdee05ec0a156abe94750c8f0fa3e0f22e813_dGVzdHMvdGVzdC1waWNrLnQ= 100644
--- a/tests/test-pick.t
+++ b/tests/test-pick.t
@@ -269,7 +269,8 @@
   pick in progress, will be aborted
 #endif
   $ hg abort
-  aborting pick, updating to c437988de89f
+  pick aborted
+  working directory is now at c437988de89f
 
   $ hg glog
   @  10:c437988de89f foo to b