Mercurial > evolve

diff tests/test-obsolete.t @ 3109:3024ae293732 mercurial-4.1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test-compat: merge with mercurial-4.2 branch
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Fri, 20 Oct 2017 18:41:05 +0200
parents 00e4d31b8cdb 9c9c8c1eeb93
children 50be10c63825 a1cdc128defd
line wrap: on
line diff
--- a/tests/test-obsolete.t	Fri Oct 20 18:34:22 2017 +0200
+++ b/tests/test-obsolete.t	Fri Oct 20 18:41:05 2017 +0200
@@ -10,6 +10,7 @@
   > debugobsolete=debugobsolete -d '0 0'
   > [extensions]
   > hgext.rebase=
+  > color =
   > EOF
   $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext3rd/evolve/" >> $HGRCPATH
   $ mkcommit() {
@@ -274,7 +275,7 @@
   adding file changes
   added 1 changesets with 1 changes to [12] files \(\+1 heads\) (re)
   1 new obsolescence markers
-  (run 'hg heads' to see heads, 'hg merge' to merge)
+  (run 'hg heads .' to see heads, 'hg merge' to merge)
   $ qlog -R ../other-new
   6
   - 909a0fb57e5d
@@ -364,7 +365,7 @@
   adding file changes
   added 1 changesets with 1 changes to [12] files \(\+1 heads\) (re)
   1 new obsolescence markers
-  (run 'hg heads' to see heads, 'hg merge' to merge)
+  (run 'hg heads .' to see heads, 'hg merge' to merge)
 
   $ hg up -q 7 # to check rollback update behavior
   $ qlog