# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@fb.com>
# Date 1407545180 25200
# Node ID 657a38cd2ae3db2b779aa92e7642e9114131fe23
# Parent  45c4739e85dcd33dd4468ae300ff700d6f3a66e7
evolve: make the "X markers added" message during pull important

diff --git a/hgext/evolve.py b/hgext/evolve.py
--- a/hgext/evolve.py
+++ b/hgext/evolve.py
@@ -2681,7 +2681,7 @@
         if 5 < bytes:
             obsexcmsg(ui, "merging obsolescence markers (%i bytes)\n"
                       % bytes)
-            obsexcmsg(ui, "%i markers added\n" % new)
+            obsexcmsg(ui, "%i 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)
+            obsexcmsg(ui, "%i markers added\n" % new, True)
         else:
             obsexcmsg(ui, "no unknown remote markers\n")
         obsexcmsg(ui, "DONE\n")
diff --git a/tests/test-evolve.t b/tests/test-evolve.t
--- a/tests/test-evolve.t
+++ b/tests/test-evolve.t
@@ -464,6 +464,7 @@
   adding file changes
   added 1 changesets with 1 changes to 1 files
   pull obsolescence markers
+  2 markers added
   (run 'hg update' to get a working copy)
   $ hg up
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
diff --git a/tests/test-obsolete.t b/tests/test-obsolete.t
--- a/tests/test-obsolete.t
+++ b/tests/test-obsolete.t
@@ -274,6 +274,7 @@
   adding file changes
   added 1 changesets with 1 changes to [12] files \(\+1 heads\) (re)
   pull obsolescence markers
+  1 markers added
   (run 'hg heads' to see heads, 'hg merge' to merge)
   $ qlog -R ../other-new
   6
@@ -364,6 +365,7 @@
   adding file changes
   added 1 changesets with 1 changes to [12] files \(\+1 heads\) (re)
   pull obsolescence markers
+  1 markers added
   (run 'hg heads' to see heads, 'hg merge' to merge)
 
   $ hg up -q 7 # to check rollback update behavior
diff --git a/tests/test-simple4server.t b/tests/test-simple4server.t
--- a/tests/test-simple4server.t
+++ b/tests/test-simple4server.t
@@ -110,6 +110,7 @@
   adding file changes
   added 1 changesets with 1 changes to [12] files \(\+1 heads\) (re)
   pull obsolescence markers
+  2 markers added
   (run 'hg heads' to see heads)
   $ hg -R ../other pull
   pulling from http://localhost:$HGPORT/
diff --git a/tests/test-tutorial.t b/tests/test-tutorial.t
--- a/tests/test-tutorial.t
+++ b/tests/test-tutorial.t
@@ -522,6 +522,7 @@
   adding file changes
   added 1 changesets with 1 changes to 1 files
   pull obsolescence markers
+  1 markers added
   (run 'hg update' to get a working copy)
   $ hg log -G
   o  75954b8cd933 (public): bathroom stuff
@@ -579,6 +580,7 @@
   adding file changes
   added 1 changesets with 1 changes to 1 files
   pull obsolescence markers
+  1 markers added
   (run 'hg update' to get a working copy)
   $ hg log -G
   o  75954b8cd933 (draft): bathroom stuff
@@ -639,6 +641,7 @@
   adding file changes
   added 1 changesets with 1 changes to 1 files (+1 heads)
   pull obsolescence markers
+  0 markers added
   (run 'hg heads' to see heads, 'hg merge' to merge)
   1 new unstable changesets
 
@@ -737,6 +740,7 @@
   searching for changes
   no changes found
   pull obsolescence markers
+  0 markers added
   working directory parent is obsolete!
 
 now let's see where we are, and update to the successor
@@ -767,6 +771,7 @@
   adding file changes
   added 1 changesets with 1 changes to 1 files
   pull obsolescence markers
+  0 markers added
   (run 'hg update' to get a working copy)
   $ hg log -G
   o  99f039c5ec9e (draft): SPAM SPAM SPAM
diff --git a/tests/test-wireproto.t b/tests/test-wireproto.t
--- a/tests/test-wireproto.t
+++ b/tests/test-wireproto.t
@@ -91,6 +91,7 @@
   adding file changes
   added 1 changesets with 1 changes to [12] files \(\+1 heads\) (re)
   pull obsolescence markers
+  2 markers added
   (run 'hg heads' to see heads)
   $ hg -R ../other pull
   pulling from ssh://user@dummy/server