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-tutorial.t
changeset 1035 59bc29c84ce0
parent 996 b98dd5d3065c
child 1036 70de12b7721a 
--- a/tests/test-tutorial.t	Fri Aug 08 17:10:31 2014 -0700
+++ b/tests/test-tutorial.t	Fri Aug 08 17:16:29 2014 -0700
@@ -224,9 +224,6 @@
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files (+1 heads)
-  OBSEXC: pull obsolescence markers
-  OBSEXC: no unknown remote markers
-  OBSEXC: DONE
   (run 'hg heads' to see heads, 'hg merge' to merge)
 
 I now have a new heads. Note that this remote head is immutable
@@ -405,10 +402,6 @@
   adding manifests
   adding file changes
   added 3 changesets with 3 changes to 1 files
-  OBSEXC: computing relevant nodes
-  OBSEXC: computing markers relevant to 5 nodes
-  OBSEXC: pushing 6 markers (487 bytes)
-  OBSEXC: DONE
 
 for simplicity sake we get the bathroom change in line again
 
@@ -526,10 +519,6 @@
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files
-  OBSEXC: pull obsolescence markers
-  OBSEXC: merging obsolescence markers (560 bytes)
-  OBSEXC: 1 markers added
-  OBSEXC: DONE
   (run 'hg update' to get a working copy)
   $ hg log -G
   o  75954b8cd933 (public): bathroom stuff
@@ -586,10 +575,6 @@
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files
-  OBSEXC: pull obsolescence markers
-  OBSEXC: merging obsolescence markers (560 bytes)
-  OBSEXC: 1 markers added
-  OBSEXC: DONE
   (run 'hg update' to get a working copy)
   $ hg log -G
   o  75954b8cd933 (draft): bathroom stuff
@@ -649,10 +634,6 @@
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files (+1 heads)
-  OBSEXC: pull obsolescence markers
-  OBSEXC: merging obsolescence markers (560 bytes)
-  OBSEXC: 0 markers added
-  OBSEXC: DONE
   (run 'hg heads' to see heads, 'hg merge' to merge)
   1 new unstable changesets
 
@@ -741,10 +722,6 @@
   adding manifests
   adding file changes
   added 2 changesets with 2 changes to 1 files (+1 heads)
-  OBSEXC: computing relevant nodes
-  OBSEXC: computing markers relevant to 7 nodes
-  OBSEXC: pushing 10 markers (803 bytes)
-  OBSEXC: DONE
 
 remote get a warning that current working directory is based on an obsolete changeset
 
@@ -753,10 +730,6 @@
   pulling from $TESTTMP/local
   searching for changes
   no changes found
-  OBSEXC: pull obsolescence markers
-  OBSEXC: merging obsolescence markers (803 bytes)
-  OBSEXC: 0 markers added
-  OBSEXC: DONE
   working directory parent is obsolete!
 
 now let's see where we are, and update to the successor
@@ -786,10 +759,6 @@
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files
-  OBSEXC: pull obsolescence markers
-  OBSEXC: merging obsolescence markers (803 bytes)
-  OBSEXC: 0 markers added
-  OBSEXC: DONE
   (run 'hg update' to get a working copy)
   $ hg log -G
   o  99f039c5ec9e (draft): SPAM SPAM SPAM
evolve