Mercurial > evolve

diff tests/test-evolve.t @ 1800:1554b30b18eb mercurial-3.4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with 5.6.0 no extra changes were needed from the mercurial-3.5 branch.
author Pierre-Yves David <pierre-yves.david@ens-lyon.org>
date Wed, 01 Feb 2017 16:03:39 +0100
parents 6d54fd20bb81 b1809340478b
children
line wrap: on
line diff
--- a/tests/test-evolve.t	Wed Feb 01 15:51:02 2017 +0100
+++ b/tests/test-evolve.t	Wed Feb 01 16:03:39 2017 +0100
@@ -475,6 +475,7 @@
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files
+  pull obsolescence markers
   $ cd alpha
 
   $ cat << EOF > A
@@ -531,7 +532,8 @@
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files
-  2 new obsolescence markers
+  pull obsolescence markers
+  2 obsolescence markers added
   (run 'hg update' to get a working copy)
   $ hg up
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved