Mercurial > evolve

diff tests/test-evolve-content-divergence.t @ 4165:ccbfbeee6cf3 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test: backed out test output changes from changeset ef22eef37ecc
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Fri, 12 Oct 2018 14:55:46 +0200
parents 4eb3877540f1
children e541acefbaa5 ab3581bc0637
line wrap: on
line diff
--- a/tests/test-evolve-content-divergence.t	Fri Oct 12 14:55:37 2018 +0200
+++ b/tests/test-evolve-content-divergence.t	Fri Oct 12 14:55:46 2018 +0200
@@ -793,7 +793,7 @@
   adding manifests
   adding file changes
   added 5 changesets with 5 changes to 5 files
-  new changesets 8fa14d15e168:c41c793e0ef1 (5 drafts)
+  new changesets 8fa14d15e168:c41c793e0ef1
   (run 'hg update' to get a working copy)
   $ hg glog
   o  4:c41c793e0ef1 added d
@@ -865,7 +865,7 @@
   added 4 changesets with 0 changes to 4 files (+1 heads)
   5 new obsolescence markers
   8 new content-divergent changesets
-  new changesets 82b74d5dc678:15c781f93cac (4 drafts)
+  new changesets 82b74d5dc678:15c781f93cac
   (run 'hg heads' to see heads, 'hg merge' to merge)
 
   $ hg glog