diff tests/test-tutorial.t @ 1038:45c4739e85dc

evolve: make the "pulling obsolescence marker" message important This is likely to take some time the user needs to know what is going on.
author Pierre-Yves David <pierre-yves.david@fb.com>
date Fri, 08 Aug 2014 17:40:01 -0700
parents bddee73b361e
children 657a38cd2ae3
line wrap: on
line diff
--- a/tests/test-tutorial.t	Fri Aug 08 17:34:22 2014 -0700
+++ b/tests/test-tutorial.t	Fri Aug 08 17:40:01 2014 -0700
@@ -224,6 +224,7 @@
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files (+1 heads)
+  pull obsolescence markers
   (run 'hg heads' to see heads, 'hg merge' to merge)
 
 I now have a new heads. Note that this remote head is immutable
@@ -520,6 +521,7 @@
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files
+  pull obsolescence markers
   (run 'hg update' to get a working copy)
   $ hg log -G
   o  75954b8cd933 (public): bathroom stuff
@@ -576,6 +578,7 @@
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files
+  pull obsolescence markers
   (run 'hg update' to get a working copy)
   $ hg log -G
   o  75954b8cd933 (draft): bathroom stuff
@@ -635,6 +638,7 @@
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files (+1 heads)
+  pull obsolescence markers
   (run 'hg heads' to see heads, 'hg merge' to merge)
   1 new unstable changesets
 
@@ -732,6 +736,7 @@
   pulling from $TESTTMP/local
   searching for changes
   no changes found
+  pull obsolescence markers
   working directory parent is obsolete!
 
 now let's see where we are, and update to the successor
@@ -761,6 +766,7 @@
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files
+  pull obsolescence markers
   (run 'hg update' to get a working copy)
   $ hg log -G
   o  99f039c5ec9e (draft): SPAM SPAM SPAM