Mercurial Mercurial > pub > hg > evolve / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests/test-simple4server.t
changeset 1035 59bc29c84ce0
parent 963 f80e8e3c3726
child 1036 70de12b7721a 
--- a/tests/test-simple4server.t	Fri Aug 08 17:10:31 2014 -0700
+++ b/tests/test-simple4server.t	Fri Aug 08 17:16:29 2014 -0700
@@ -50,10 +50,6 @@
   pulling from http://localhost:$HGPORT/
   searching for changes
   no changes found
-  OBSEXC: pull obsolescence markers
-  OBSEXC: looking for common markers in 2 nodes
-  OBSEXC: no unknown remote markers
-  OBSEXC: DONE
   $ hg pull -R ../other
   pulling from http://localhost:$HGPORT/
   requesting all changes
@@ -61,10 +57,6 @@
   adding manifests
   adding file changes
   added 2 changesets with 2 changes to 2 files
-  OBSEXC: pull obsolescence markers
-  OBSEXC: looking for common markers in 2 nodes
-  OBSEXC: no unknown remote markers
-  OBSEXC: DONE
   (run 'hg update' to get a working copy)
   $ hg push -R ../other
   pushing to http://localhost:$HGPORT/
@@ -98,20 +90,10 @@
   remote: adding manifests
   remote: adding file changes
   remote: added 1 changesets with 1 changes to 1 files (+1 heads)
-  OBSEXC: computing relevant nodes
-  OBSEXC: looking for common markers in 2 nodes
-  OBSEXC: computing markers relevant to 1 nodes
-  OBSEXC: pushing 2 markers (171 bytes)
-  OBSEXC: DONE
   $ hg push
   pushing to http://localhost:$HGPORT/
   searching for changes
   no changes found
-  OBSEXC: computing relevant nodes
-  OBSEXC: looking for common markers in [23] nodes (re)
-  OBSEXC: markers already in sync
-  OBSEXC: no marker to push
-  OBSEXC: DONE
   [1]
 
 Pull
@@ -124,20 +106,11 @@
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to [12] files \(\+1 heads\) (re)
-  OBSEXC: pull obsolescence markers
-  OBSEXC: looking for common markers in [23] nodes (re)
-  OBSEXC: merging obsolescence markers (171 bytes)
-  OBSEXC: 2 markers added
-  OBSEXC: DONE
   (run 'hg heads' to see heads)
   $ hg -R ../other pull
   pulling from http://localhost:$HGPORT/
   searching for changes
   no changes found
-  OBSEXC: pull obsolescence markers
-  OBSEXC: looking for common markers in [23] nodes (re)
-  OBSEXC: no unknown remote markers
-  OBSEXC: DONE
 
   $ cd ..
evolve