[PATCH evolve-ext] tests: update test output to match core

Ryan McElroy rm at fb.com
Fri Mar 4 12:45:33 EST 2016


# HG changeset patch
# User Ryan McElroy <rmcelroy at fb.com>
# Date 1457005857 28800
#      Thu Mar 03 03:50:57 2016 -0800
# Branch stable
# Node ID 24c4f49bbc3c6173cf0f9717ab2a47cb853fecbe
# Parent  9f0b24eda7eadd4abacb566004eea9d87c16f416
tests: update test output to match core

diff --git a/tests/test-obsolete.t b/tests/test-obsolete.t
--- a/tests/test-obsolete.t
+++ b/tests/test-obsolete.t
@@ -457,6 +457,7 @@ Check that auto update ignores hidden ch
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg up 
   3 files updated, 0 files merged, 0 files removed, 0 files unresolved
+  1 other heads for branch "default"
   $ hg id -n
   8
 
diff --git a/tests/test-sharing.t b/tests/test-sharing.t
--- a/tests/test-sharing.t
+++ b/tests/test-sharing.t
@@ -89,6 +89,7 @@ the new obsolete changeset.
   added 1 changesets with 1 changes to 1 files (+1 heads)
   2 new obsolescence markers
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+  1 other heads for branch "default"
 
 Figure SG03
   $ hg shortlog --hidden -G
@@ -119,6 +120,7 @@ Figure SG04 (test-repo)
   $ cd ../test-repo
   $ hg update
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+  1 other heads for branch "default"
   $ hg shortlog --hidden -G
   @  4:de6151c48e1c  draft  fix bug 37
   |


More information about the Mercurial-devel mailing list