Mercurial > public > mercurial-scm > evolve
diff hgext/evolve.py @ 1040:640f3280559e
evolve: add "obsolescence" in front of marked in the previous message
author | Pierre-Yves David <pierre-yves.david@fb.com> |
---|---|
date | Fri, 08 Aug 2014 17:49:22 -0700 |
parents | 657a38cd2ae3 |
children | 7632f1f79946 |
line wrap: on
line diff
--- a/hgext/evolve.py Fri Aug 08 17:46:20 2014 -0700 +++ b/hgext/evolve.py Fri Aug 08 17:49:22 2014 -0700 @@ -2681,7 +2681,7 @@ if 5 < bytes: obsexcmsg(ui, "merging obsolescence markers (%i bytes)\n" % bytes) - obsexcmsg(ui, "%i markers added\n" % new, True) + obsexcmsg(ui, "%i obsolescence markers added\n" % new, True) tr = op.gettransaction() else: obsexcmsg(ui, "no unknown remote markers\n") @@ -2696,7 +2696,7 @@ old = len(pullop.repo.obsstore._all) pullop.repo.obsstore.mergemarkers(tr, obsdata) new = len(pullop.repo.obsstore._all) - old - obsexcmsg(ui, "%i markers added\n" % new, True) + obsexcmsg(ui, "%i obsolescence markers added\n" % new, True) else: obsexcmsg(ui, "no unknown remote markers\n") obsexcmsg(ui, "DONE\n")