--- a/tests/test-exchange-A3.t Wed Aug 27 18:28:09 2014 +0200
+++ b/tests/test-exchange-A3.t Fri Aug 29 11:56:16 2014 +0200
@@ -88,14 +88,11 @@
## pushing "A1" from main to pushdest
pushing to pushdest
searching for changes
- OBSEXC: computing relevant nodes
- OBSEXC: computing markers relevant to 2 nodes
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
- OBSEXC: pushing 1 obsolescence markers (65 bytes)
- OBSEXC: DONE
+ pushing 1 obsolescence markers (65 bytes)
## post push state
# obstore: main
28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
@@ -110,10 +107,8 @@
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
- OBSEXC: pull obsolescence markers
- OBSEXC: merging obsolescence markers (65 bytes)
- OBSEXC: 1 obsolescence markers added
- OBSEXC: DONE
+ pull obsolescence markers
+ 1 obsolescence markers added
(run 'hg update' to get a working copy)
## post pull state
# obstore: main
@@ -173,8 +168,6 @@
$ hg push -R main -r e5ea8f9c7314 pushdest
pushing to pushdest
searching for changes
- OBSEXC: computing relevant nodes
- OBSEXC: computing markers relevant to 2 nodes
abort: push creates new remote head e5ea8f9c7314!
(merge or see "hg help push" for details about pushing new heads)
[255]
@@ -194,14 +187,11 @@
## pushing "A1" from main to pushdest
pushing to pushdest
searching for changes
- OBSEXC: computing relevant nodes
- OBSEXC: computing markers relevant to 2 nodes
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
- OBSEXC: pushing 1 obsolescence markers (65 bytes)
- OBSEXC: DONE
+ pushing 1 obsolescence markers (65 bytes)
## post push state
# obstore: main
28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
@@ -216,10 +206,8 @@
adding manifests
adding file changes
added 1 changesets with 1 changes to 2 files (+1 heads)
- OBSEXC: pull obsolescence markers
- OBSEXC: merging obsolescence markers (65 bytes)
- OBSEXC: 1 obsolescence markers added
- OBSEXC: DONE
+ pull obsolescence markers
+ 1 obsolescence markers added
(run 'hg heads' to see heads, 'hg merge' to merge)
1 new unstable changesets
## post pull state