# HG changeset patch # User Martin von Zweigbergk # Date 1536275664 25200 # Node ID 6179a40d27c7319a7c06d3ff3195e0e32b1607be # Parent ecd90548a10dcb17ebe5641fb78981663e9ef14c evolve: fix use of "'%d' % ctx" ctx has not been convertible to int since Mercurial commit 38f480502043 (context: remove basectx.__int__ (API), 2018-02-24). I decided to use "%s" instead to match other similar messages in evolvecmd.py. I also added a space to match the other messages. diff -r ecd90548a10d -r 6179a40d27c7 hgext3rd/evolve/evolvecmd.py --- a/hgext3rd/evolve/evolvecmd.py Thu Sep 06 23:24:26 2018 -0400 +++ b/hgext3rd/evolve/evolvecmd.py Thu Sep 06 16:14:24 2018 -0700 @@ -355,7 +355,7 @@ # we don't handle split in content-divergence yet if len(others) > 1: othersstr = "[%s]" % (','.join([str(i) for i in others])) - msg = _("skipping %d:%s with a changeset that got split" + msg = _("skipping %s: %s with a changeset that got split" " into multiple ones:\n" "|[%s]\n" "| This is not handled by automatic evolution yet\n"