--- a/hgext/evolve.py Wed Aug 27 17:36:35 2014 +0200
+++ b/hgext/evolve.py Wed Aug 27 17:55:20 2014 +0200
@@ -2469,7 +2469,9 @@
try:
tr = peer._repo.transaction('pushkey: obsolete markers')
try:
- peer._repo.obsstore.mergemarkers(tr, data)
+ new = peer._repo.obsstore.mergemarkers(tr, data)
+ if new is not None:
+ obsexcmsg(peer._repo.ui, "%i obsolescence markers added\n" % new, True)
tr.close()
finally:
tr.release()
@@ -2488,7 +2490,9 @@
try:
tr = repo.transaction('pushkey: obsolete markers')
try:
- repo.obsstore.mergemarkers(tr, data)
+ new = repo.obsstore.mergemarkers(tr, data)
+ if new is not None:
+ obsexcmsg(repo.ui, "%i obsolescence markers added\n" % new, True)
tr.close()
finally:
tr.release()