--- a/tests/test-exchange-A2.t	Mon Mar 03 13:27:53 2014 -0800
+++ b/tests/test-exchange-A2.t	Mon Mar 03 14:03:41 2014 -0800
@@ -64,16 +64,16 @@
 Actual Test
 ---------------
 
-  $ cd A.2
-  $ hg -R main id -r 'desc(A)'
-  f5bc6836db60
-  $ hg -R main     debugobsolete
+  $ dotest A.2 A
+  ## Running testcase A.2
+  # testing echange of "A" (f5bc6836db60)
+  ## initial state
+  # obstore: main
   aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {'date': '', 'user': 'test'}
   bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb 35b1839966785d5703a01607229eea932db42f87 0 {'date': '', 'user': 'test'}
-  $ hg -R pushdest debugobsolete
-  $ hg -R pulldest debugobsolete
-
-  $ hg -R main push -r 'desc(A)' pushdest
+  # obstore: pushdest
+  # obstore: pulldest
+  ## pushing "A" from main to pushdest
   pushing to pushdest
   searching for changes
   adding changesets
@@ -85,13 +85,14 @@
   OBSEXC: encoding 1 markers
   OBSEXC: sending 1 pushkey payload (78 bytes)
   OBSEXC: DONE
-  $ hg -R main     debugobsolete
+  ## post push state
+  # obstore: main
   aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {'date': '', 'user': 'test'}
   bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb 35b1839966785d5703a01607229eea932db42f87 0 {'date': '', 'user': 'test'}
-  $ hg -R pushdest debugobsolete
+  # obstore: pushdest
   aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {'date': '', 'user': 'test'}
-  $ hg -R pulldest debugobsolete
-  $ hg -R pulldest pull -r 'f5bc6836db60' main
+  # obstore: pulldest
+  ## pulling "f5bc6836db60" from main into pulldest
   pulling from main
   searching for changes
   adding changesets
@@ -103,12 +104,14 @@
   OBSEXC: 1 markers added
   OBSEXC: DONE
   (run 'hg update' to get a working copy)
-  $ hg -R main     debugobsolete
+  ## post pull state
+  # obstore: main
   aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {'date': '', 'user': 'test'}
   bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb 35b1839966785d5703a01607229eea932db42f87 0 {'date': '', 'user': 'test'}
-  $ hg -R pushdest debugobsolete
+  # obstore: pushdest
   aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {'date': '', 'user': 'test'}
-  $ hg -R pulldest debugobsolete
+  # obstore: pulldest
   aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {'date': '', 'user': 'test'}
 
+
   $ cd ..