# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@fb.com>
# Date 1407545362 25200
# Node ID 640f3280559e68ca243ddbcd2bb2764dd4724cb1
# Parent  657a38cd2ae3db2b779aa92e7642e9114131fe23
evolve: add "obsolescence" in front of marked in the previous message

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, 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")
diff --git a/tests/test-evolve.t b/tests/test-evolve.t
--- a/tests/test-evolve.t
+++ b/tests/test-evolve.t
@@ -464,7 +464,7 @@
   adding file changes
   added 1 changesets with 1 changes to 1 files
   pull obsolescence markers
-  2 markers added
+  2 obsolescence 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-exchange-A1.t b/tests/test-exchange-A1.t
--- a/tests/test-exchange-A1.t
+++ b/tests/test-exchange-A1.t
@@ -91,7 +91,7 @@
   added 1 changesets with 1 changes to 1 files
   OBSEXC: pull obsolescence markers
   OBSEXC: merging obsolescence markers (62 bytes)
-  OBSEXC: 1 markers added
+  OBSEXC: 1 obsolescence markers added
   OBSEXC: DONE
   (run 'hg update' to get a working copy)
   ## post pull state
@@ -141,7 +141,7 @@
   added 1 changesets with 1 changes to 1 files
   OBSEXC: pull obsolescence markers
   OBSEXC: merging obsolescence markers (62 bytes)
-  OBSEXC: 1 markers added
+  OBSEXC: 1 obsolescence markers added
   OBSEXC: DONE
   (run 'hg update' to get a working copy)
   ## post pull state
@@ -250,7 +250,7 @@
   added 2 changesets with 2 changes to 2 files
   OBSEXC: pull obsolescence markers
   OBSEXC: merging obsolescence markers (62 bytes)
-  OBSEXC: 1 markers added
+  OBSEXC: 1 obsolescence markers added
   OBSEXC: DONE
   (run 'hg update' to get a working copy)
   ## post pull state
@@ -297,7 +297,7 @@
   added 2 changesets with 2 changes to 2 files
   OBSEXC: pull obsolescence markers
   OBSEXC: merging obsolescence markers (62 bytes)
-  OBSEXC: 1 markers added
+  OBSEXC: 1 obsolescence markers added
   OBSEXC: DONE
   (run 'hg update' to get a working copy)
   ## post pull state
diff --git a/tests/test-exchange-A2.t b/tests/test-exchange-A2.t
--- a/tests/test-exchange-A2.t
+++ b/tests/test-exchange-A2.t
@@ -100,7 +100,7 @@
   added 1 changesets with 1 changes to 1 files
   OBSEXC: pull obsolescence markers
   OBSEXC: merging obsolescence markers (62 bytes)
-  OBSEXC: 1 markers added
+  OBSEXC: 1 obsolescence markers added
   OBSEXC: DONE
   (run 'hg update' to get a working copy)
   ## post pull state
diff --git a/tests/test-exchange-A3.t b/tests/test-exchange-A3.t
--- a/tests/test-exchange-A3.t
+++ b/tests/test-exchange-A3.t
@@ -112,7 +112,7 @@
   added 1 changesets with 1 changes to 1 files
   OBSEXC: pull obsolescence markers
   OBSEXC: merging obsolescence markers (62 bytes)
-  OBSEXC: 1 markers added
+  OBSEXC: 1 obsolescence markers added
   OBSEXC: DONE
   (run 'hg update' to get a working copy)
   ## post pull state
@@ -216,7 +216,7 @@
   added 1 changesets with 1 changes to 2 files (+1 heads)
   OBSEXC: pull obsolescence markers
   OBSEXC: merging obsolescence markers (62 bytes)
-  OBSEXC: 1 markers added
+  OBSEXC: 1 obsolescence markers added
   OBSEXC: DONE
   (run 'hg heads' to see heads, 'hg merge' to merge)
   1 new unstable changesets
diff --git a/tests/test-exchange-A4.t b/tests/test-exchange-A4.t
--- a/tests/test-exchange-A4.t
+++ b/tests/test-exchange-A4.t
@@ -105,7 +105,7 @@
   added 2 changesets with 2 changes to 2 files
   OBSEXC: pull obsolescence markers
   OBSEXC: merging obsolescence markers (62 bytes)
-  OBSEXC: 1 markers added
+  OBSEXC: 1 obsolescence markers added
   OBSEXC: DONE
   (run 'hg update' to get a working copy)
   ## post pull state
diff --git a/tests/test-exchange-A5.t b/tests/test-exchange-A5.t
--- a/tests/test-exchange-A5.t
+++ b/tests/test-exchange-A5.t
@@ -113,7 +113,7 @@
   added 1 changesets with 1 changes to 1 files
   OBSEXC: pull obsolescence markers
   OBSEXC: merging obsolescence markers (62 bytes)
-  OBSEXC: 1 markers added
+  OBSEXC: 1 obsolescence markers added
   OBSEXC: DONE
   (run 'hg update' to get a working copy)
   ## post pull state
diff --git a/tests/test-exchange-A6.t b/tests/test-exchange-A6.t
--- a/tests/test-exchange-A6.t
+++ b/tests/test-exchange-A6.t
@@ -95,7 +95,7 @@
   no changes found
   OBSEXC: pull obsolescence markers
   OBSEXC: merging obsolescence markers (62 bytes)
-  OBSEXC: 1 markers added
+  OBSEXC: 1 obsolescence markers added
   OBSEXC: DONE
   ## post pull state
   # obstore: main
@@ -135,7 +135,7 @@
   no changes found
   OBSEXC: pull obsolescence markers
   OBSEXC: merging obsolescence markers (62 bytes)
-  OBSEXC: 1 markers added
+  OBSEXC: 1 obsolescence markers added
   OBSEXC: DONE
   ## post pull state
   # obstore: main
diff --git a/tests/test-exchange-B1.t b/tests/test-exchange-B1.t
--- a/tests/test-exchange-B1.t
+++ b/tests/test-exchange-B1.t
@@ -90,7 +90,7 @@
   added 1 changesets with 1 changes to 1 files
   OBSEXC: pull obsolescence markers
   OBSEXC: merging obsolescence markers (89 bytes)
-  OBSEXC: 1 markers added
+  OBSEXC: 1 obsolescence markers added
   OBSEXC: DONE
   (run 'hg update' to get a working copy)
   ## post pull state
@@ -137,7 +137,7 @@
   added 1 changesets with 1 changes to 1 files
   OBSEXC: pull obsolescence markers
   OBSEXC: merging obsolescence markers (89 bytes)
-  OBSEXC: 1 markers added
+  OBSEXC: 1 obsolescence markers added
   OBSEXC: DONE
   (run 'hg update' to get a working copy)
   ## post pull state
diff --git a/tests/test-exchange-B2.t b/tests/test-exchange-B2.t
--- a/tests/test-exchange-B2.t
+++ b/tests/test-exchange-B2.t
@@ -78,7 +78,7 @@
   no changes found
   OBSEXC: pull obsolescence markers
   OBSEXC: merging obsolescence markers (89 bytes)
-  OBSEXC: 1 markers added
+  OBSEXC: 1 obsolescence markers added
   OBSEXC: DONE
   ## post pull state
   # obstore: main
@@ -118,7 +118,7 @@
   no changes found
   OBSEXC: pull obsolescence markers
   OBSEXC: merging obsolescence markers (89 bytes)
-  OBSEXC: 1 markers added
+  OBSEXC: 1 obsolescence markers added
   OBSEXC: DONE
   ## post pull state
   # obstore: main
diff --git a/tests/test-exchange-B4.t b/tests/test-exchange-B4.t
--- a/tests/test-exchange-B4.t
+++ b/tests/test-exchange-B4.t
@@ -104,7 +104,7 @@
   no changes found
   OBSEXC: pull obsolescence markers
   OBSEXC: merging obsolescence markers (89 bytes)
-  OBSEXC: 1 markers added
+  OBSEXC: 1 obsolescence markers added
   OBSEXC: DONE
   ## post pull state
   # obstore: main
@@ -144,7 +144,7 @@
   no changes found
   OBSEXC: pull obsolescence markers
   OBSEXC: merging obsolescence markers (89 bytes)
-  OBSEXC: 1 markers added
+  OBSEXC: 1 obsolescence markers added
   OBSEXC: DONE
   ## post pull state
   # obstore: main
diff --git a/tests/test-exchange-B5.t b/tests/test-exchange-B5.t
--- a/tests/test-exchange-B5.t
+++ b/tests/test-exchange-B5.t
@@ -112,7 +112,7 @@
   added 2 changesets with 2 changes to 2 files
   OBSEXC: pull obsolescence markers
   OBSEXC: merging obsolescence markers (150 bytes)
-  OBSEXC: 2 markers added
+  OBSEXC: 2 obsolescence markers added
   OBSEXC: DONE
   (run 'hg update' to get a working copy)
   1 new unstable changesets
@@ -167,7 +167,7 @@
   added 2 changesets with 2 changes to 2 files
   OBSEXC: pull obsolescence markers
   OBSEXC: merging obsolescence markers (150 bytes)
-  OBSEXC: 2 markers added
+  OBSEXC: 2 obsolescence markers added
   OBSEXC: DONE
   (run 'hg update' to get a working copy)
   1 new unstable changesets
diff --git a/tests/test-exchange-B6.t b/tests/test-exchange-B6.t
--- a/tests/test-exchange-B6.t
+++ b/tests/test-exchange-B6.t
@@ -92,7 +92,7 @@
   no changes found
   OBSEXC: pull obsolescence markers
   OBSEXC: merging obsolescence markers (150 bytes)
-  OBSEXC: 2 markers added
+  OBSEXC: 2 obsolescence markers added
   OBSEXC: DONE
   ## post pull state
   # obstore: main
diff --git a/tests/test-exchange-C1.t b/tests/test-exchange-C1.t
--- a/tests/test-exchange-C1.t
+++ b/tests/test-exchange-C1.t
@@ -87,7 +87,7 @@
   no changes found
   OBSEXC: pull obsolescence markers
   OBSEXC: merging obsolescence markers (177 bytes)
-  OBSEXC: 2 markers added
+  OBSEXC: 2 obsolescence markers added
   OBSEXC: DONE
   ## post pull state
   # obstore: main
@@ -133,7 +133,7 @@
   no changes found
   OBSEXC: pull obsolescence markers
   OBSEXC: merging obsolescence markers (177 bytes)
-  OBSEXC: 2 markers added
+  OBSEXC: 2 obsolescence markers added
   OBSEXC: DONE
   ## post pull state
   # obstore: main
diff --git a/tests/test-exchange-C2.t b/tests/test-exchange-C2.t
--- a/tests/test-exchange-C2.t
+++ b/tests/test-exchange-C2.t
@@ -101,7 +101,7 @@
   added 1 changesets with 1 changes to 1 files
   OBSEXC: pull obsolescence markers
   OBSEXC: merging obsolescence markers (150 bytes)
-  OBSEXC: 2 markers added
+  OBSEXC: 2 obsolescence markers added
   OBSEXC: DONE
   (run 'hg update' to get a working copy)
   ## post pull state
@@ -154,7 +154,7 @@
   added 1 changesets with 1 changes to 1 files
   OBSEXC: pull obsolescence markers
   OBSEXC: merging obsolescence markers (150 bytes)
-  OBSEXC: 2 markers added
+  OBSEXC: 2 obsolescence markers added
   OBSEXC: DONE
   (run 'hg update' to get a working copy)
   ## post pull state
diff --git a/tests/test-exchange-C3.t b/tests/test-exchange-C3.t
--- a/tests/test-exchange-C3.t
+++ b/tests/test-exchange-C3.t
@@ -102,7 +102,7 @@
   no changes found
   OBSEXC: pull obsolescence markers
   OBSEXC: merging obsolescence markers (238 bytes)
-  OBSEXC: 3 markers added
+  OBSEXC: 3 obsolescence markers added
   OBSEXC: DONE
   ## post pull state
   # obstore: main
@@ -154,7 +154,7 @@
   no changes found
   OBSEXC: pull obsolescence markers
   OBSEXC: merging obsolescence markers (238 bytes)
-  OBSEXC: 3 markers added
+  OBSEXC: 3 obsolescence markers added
   OBSEXC: DONE
   ## post pull state
   # obstore: main
diff --git a/tests/test-exchange-C4.t b/tests/test-exchange-C4.t
--- a/tests/test-exchange-C4.t
+++ b/tests/test-exchange-C4.t
@@ -108,7 +108,7 @@
   no changes found
   OBSEXC: pull obsolescence markers
   OBSEXC: merging obsolescence markers (150 bytes)
-  OBSEXC: 2 markers added
+  OBSEXC: 2 obsolescence markers added
   OBSEXC: DONE
   ## post pull state
   # obstore: main
diff --git a/tests/test-exchange-D1.t b/tests/test-exchange-D1.t
--- a/tests/test-exchange-D1.t
+++ b/tests/test-exchange-D1.t
@@ -95,7 +95,7 @@
   added 1 changesets with 1 changes to 1 files
   OBSEXC: pull obsolescence markers
   OBSEXC: merging obsolescence markers (150 bytes)
-  OBSEXC: 2 markers added
+  OBSEXC: 2 obsolescence markers added
   OBSEXC: DONE
   (run 'hg update' to get a working copy)
   ## post pull state
diff --git a/tests/test-exchange-D2.t b/tests/test-exchange-D2.t
--- a/tests/test-exchange-D2.t
+++ b/tests/test-exchange-D2.t
@@ -85,7 +85,7 @@
   no changes found
   OBSEXC: pull obsolescence markers
   OBSEXC: merging obsolescence markers (150 bytes)
-  OBSEXC: 2 markers added
+  OBSEXC: 2 obsolescence markers added
   OBSEXC: DONE
   ## post pull state
   # obstore: main
diff --git a/tests/test-exchange-D4.t b/tests/test-exchange-D4.t
--- a/tests/test-exchange-D4.t
+++ b/tests/test-exchange-D4.t
@@ -112,7 +112,7 @@
   added 1 changesets with 1 changes to 1 files
   OBSEXC: pull obsolescence markers
   OBSEXC: merging obsolescence markers (123 bytes)
-  OBSEXC: 2 markers added
+  OBSEXC: 2 obsolescence markers added
   OBSEXC: DONE
   (run 'hg update' to get a working copy)
   ## post pull state
diff --git a/tests/test-obsolete.t b/tests/test-obsolete.t
--- a/tests/test-obsolete.t
+++ b/tests/test-obsolete.t
@@ -274,7 +274,7 @@
   adding file changes
   added 1 changesets with 1 changes to [12] files \(\+1 heads\) (re)
   pull obsolescence markers
-  1 markers added
+  1 obsolescence markers added
   (run 'hg heads' to see heads, 'hg merge' to merge)
   $ qlog -R ../other-new
   6
@@ -365,7 +365,7 @@
   adding file changes
   added 1 changesets with 1 changes to [12] files \(\+1 heads\) (re)
   pull obsolescence markers
-  1 markers added
+  1 obsolescence 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,7 +110,7 @@
   adding file changes
   added 1 changesets with 1 changes to [12] files \(\+1 heads\) (re)
   pull obsolescence markers
-  2 markers added
+  2 obsolescence 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,7 +522,7 @@
   adding file changes
   added 1 changesets with 1 changes to 1 files
   pull obsolescence markers
-  1 markers added
+  1 obsolescence markers added
   (run 'hg update' to get a working copy)
   $ hg log -G
   o  75954b8cd933 (public): bathroom stuff
@@ -580,7 +580,7 @@
   adding file changes
   added 1 changesets with 1 changes to 1 files
   pull obsolescence markers
-  1 markers added
+  1 obsolescence markers added
   (run 'hg update' to get a working copy)
   $ hg log -G
   o  75954b8cd933 (draft): bathroom stuff
@@ -641,7 +641,7 @@
   adding file changes
   added 1 changesets with 1 changes to 1 files (+1 heads)
   pull obsolescence markers
-  0 markers added
+  0 obsolescence markers added
   (run 'hg heads' to see heads, 'hg merge' to merge)
   1 new unstable changesets
 
@@ -740,7 +740,7 @@
   searching for changes
   no changes found
   pull obsolescence markers
-  0 markers added
+  0 obsolescence markers added
   working directory parent is obsolete!
 
 now let's see where we are, and update to the successor
@@ -771,7 +771,7 @@
   adding file changes
   added 1 changesets with 1 changes to 1 files
   pull obsolescence markers
-  0 markers added
+  0 obsolescence 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,7 +91,7 @@
   adding file changes
   added 1 changesets with 1 changes to [12] files \(\+1 heads\) (re)
   pull obsolescence markers
-  2 markers added
+  2 obsolescence markers added
   (run 'hg heads' to see heads)
   $ hg -R ../other pull
   pulling from ssh://user@dummy/server