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

login
register
mail settings
Submitter Ryan McElroy
Date March 4, 2016, 5:45 p.m.
Message ID <24c4f49bbc3c6173cf0f.1457113533@devbig314.prn1.facebook.com>
Download mbox | patch
Permalink /patch/13606/
State Superseded
Headers show

Comments

Ryan McElroy - March 4, 2016, 5:45 p.m.
# HG changeset patch
# User Ryan McElroy <rmcelroy@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
Pierre-Yves David - March 7, 2016, 3:51 p.m.
On 03/04/2016 06:45 PM, Ryan McElroy wrote:
> # HG changeset patch
> # User Ryan McElroy <rmcelroy@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

Such changeset is already in core for about two weeks…

Patch

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
   |