diff -r acc2b590edd9 -r a585353a816b tests/test-exchange-A3.t
--- a/tests/test-exchange-A3.t Fri Aug 08 15:50:26 2014 -0700
+++ b/tests/test-exchange-A3.t Fri Aug 08 23:14:00 2014 -0700
@@ -73,8 +73,8 @@
$ cd ..
$ cd ..
-Actual Test for first version (changeset unknown remotly)
----------------------------------------------------------
+Actual Test for first version (changeset unknown in remote)
+-----------------------------------------------------------
$ dotest A.3.a A1
## Running testcase A.3.a
@@ -94,7 +94,7 @@
added 1 changesets with 1 changes to 1 files
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
@@ -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
@@ -125,8 +125,8 @@
28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '', 'user': 'test'}
-other variant: changeset know remotly
--------------------------------------------
+other variant: changeset known in remote
+----------------------------------------
$ setuprepos A.3.b
creating test repo for test case A.3.b
@@ -164,8 +164,8 @@
$ cd ..
$ cd ..
-Actual Test for first version (changeset unknown remotly)
----------------------------------------------------------
+Actual Test for first version (changeset unknown in remote)
+-----------------------------------------------------------
check it complains about multiple heads
@@ -198,7 +198,7 @@
added 1 changesets with 1 changes to 1 files (+1 heads)
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
@@ -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