Patchwork [2,of,2,evolve-ext] tests: adapt to summary with phases output

login
register
mail settings
Submitter Matt Harbison
Date May 19, 2015, 4:11 a.m.
Message ID <854b1beea55fabed1a10.1432008718@Envy>
Download mbox | patch
Permalink /patch/9162/
State Deferred
Headers show

Comments

Matt Harbison - May 19, 2015, 4:11 a.m.
# HG changeset patch
# User Matt Harbison <matt_harbison@yahoo.com>
# Date 1432008578 14400
#      Tue May 19 00:09:38 2015 -0400
# Node ID 854b1beea55fabed1a10bdf0aa2f21f79e0ea8da
# Parent  6be7a61ecc5285b58e3bd55efc84edbb14d626a0
tests: adapt to summary with phases output

This syncs with hg 1ef96a3b8b89.
Pierre-Yves David - May 19, 2015, 5:46 a.m.
On 05/18/2015 11:11 PM, Matt Harbison wrote:
> # HG changeset patch
> # User Matt Harbison <matt_harbison@yahoo.com>
> # Date 1432008578 14400
> #      Tue May 19 00:09:38 2015 -0400
> # Node ID 854b1beea55fabed1a10bdf0aa2f21f79e0ea8da
> # Parent  6be7a61ecc5285b58e3bd55efc84edbb14d626a0
> tests: adapt to summary with phases output
>
> This syncs with hg 1ef96a3b8b89.

I think I would like the dust to settle a bit around this change before 
inflicting it to the evolve tests.

Patch

diff --git a/tests/test-amend.t b/tests/test-amend.t
--- a/tests/test-amend.t
+++ b/tests/test-amend.t
@@ -115,6 +115,7 @@ 
   branch: foo
   commit: 1 unknown (clean)
   update: (current)
+  phases: 3 draft (draft)
 
 Check the help
   $ hg amend -h
diff --git a/tests/test-inhibit.t b/tests/test-inhibit.t
--- a/tests/test-inhibit.t
+++ b/tests/test-inhibit.t
@@ -132,6 +132,7 @@ 
   branch: default
   commit: (clean)
   update: 1 new changesets, 2 branch heads (merge)
+  phases: 6 draft (draft)
 
 check public revision got cleared
 (when adding the second inhibitor, the first one is removed because it is public)
diff --git a/tests/test-obsolete.t b/tests/test-obsolete.t
--- a/tests/test-obsolete.t
+++ b/tests/test-obsolete.t
@@ -394,6 +394,7 @@ 
   branch: default
   commit: 1 deleted, 2 unknown (clean)
   update: 2 new changesets, 2 branch heads (merge)
+  phases: 4 draft (draft)
   unstable: 1 changesets
   $ qlog
   6
@@ -669,6 +670,7 @@ 
   branch: default
   commit: (clean)
   update: (2|9|11) new changesets, (3|9|10) branch heads \(merge\) (re)
+  phases: 3 draft (draft)
   bumped: 1 changesets
   $ hg debugobsolete `getid a7a6f2b5d8a5` `getid 50f11e5e3a63`
   $ hg log -r 'divergent()'
diff --git a/tests/test-stabilize-result.t b/tests/test-stabilize-result.t
--- a/tests/test-stabilize-result.t
+++ b/tests/test-stabilize-result.t
@@ -287,6 +287,7 @@ 
   branch: default
   commit: (clean)
   update: 2 new changesets, 2 branch heads (merge)
+  phases: 3 draft (draft)
   $ hg export .
   # HG changeset patch
   # User test