Mercurial Mercurial > pub > hg > evolve / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
hgext/evolve.py
changeset 1040 640f3280559e
parent 1039 657a38cd2ae3
child 1041 7632f1f79946 
--- 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")
evolve