diff tests/test-evolve.t @ 1356:aff6bc2a6b2d

test: adapt to change in mercurial core Bundle2 is one by default and more capability have been added.
author Pierre-Yves David <pierre-yves.david@fb.com>
date Thu, 04 Jun 2015 13:26:58 -0700
parents b4a62d6f0353
children 3bb7a080da4d
line wrap: on
line diff
--- a/tests/test-evolve.t	Wed Jun 03 16:01:28 2015 -0700
+++ b/tests/test-evolve.t	Thu Jun 04 13:26:58 2015 -0700
@@ -419,7 +419,6 @@
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files
-  pull obsolescence markers
   $ cd alpha
 
   $ cat << EOF > A
@@ -476,8 +475,7 @@
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files
-  pull obsolescence markers
-  2 obsolescence markers added
+  2 new obsolescence markers
   (run 'hg update' to get a working copy)
   $ hg up
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved