tests/test-exchange-A6.t
branchstable
changeset 1048 a585353a816b
parent 1040 640f3280559e
child 1060 f6e0cfca1bf0
--- a/tests/test-exchange-A6.t	Fri Aug 08 15:50:26 2014 -0700
+++ b/tests/test-exchange-A6.t	Fri Aug 08 23:14:00 2014 -0700
@@ -42,7 +42,7 @@
   $ mkcommit A1
   created new head
 
-make both changeset known remotly
+make both changeset known in remote
 
   $ hg push -qf ../pushdest
   $ hg push -qf ../pulldest
@@ -82,7 +82,7 @@
   no changes found
   OBSEXC: computing relevant nodes
   OBSEXC: computing markers relevant to 2 nodes
-  OBSEXC: pushing 1 markers (62 bytes)
+  OBSEXC: pushing 1 obsolescence markers (62 bytes)
   OBSEXC: DONE
   ## post push state
   # obstore: main
@@ -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
@@ -106,7 +106,7 @@
   28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '', 'user': 'test'}
 
 Actual Test (bare push version)
------------------------------------
+-------------------------------
 
   $ dotest A.6.b
   ## Running testcase A.6.b
@@ -121,7 +121,7 @@
   no changes found
   OBSEXC: computing relevant nodes
   OBSEXC: computing markers relevant to 3 nodes
-  OBSEXC: pushing 1 markers (62 bytes)
+  OBSEXC: pushing 1 obsolescence markers (62 bytes)
   OBSEXC: DONE
   ## post push 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