diff -r 8413cbeae275 -r 52c5ff856b49 mercurial/exchange.py
--- a/mercurial/exchange.py	Wed Aug 02 19:09:00 2017 +0200
+++ b/mercurial/exchange.py	Wed Aug 02 19:13:56 2017 +0200
@@ -680,7 +680,7 @@
                 ctx = unfi[node]
                 if ctx.obsolete():
                     raise error.Abort(mso % ctx)
-                elif ctx.troubled():
+                elif ctx.isunstable():
                     # TODO print more than one instability in the abort
                     # message
                     raise error.Abort(mst[ctx.instabilities()[0]] % ctx)