[PATCH evolve-ext] tests: fix tests to reflect hg core changes
Stanislau Hlebik
stash at fb.com
Thu Jan 5 09:39:58 UTC 2017
# HG changeset patch
# User Stanislau Hlebik <stash at fb.com>
# Date 1483608997 28800
# Thu Jan 05 01:36:37 2017 -0800
# Node ID 98b6678ee09c76aa471b119939935a9b67b1ff77
# Parent ba9fabaca91b0897cffb7048d81193e44d440948
tests: fix tests to reflect hg core changes
In f05ede08dcf7d13794ccc9abb53877a50bf2b58b in core hg there were changes to
changeset_printer.
diff --git a/tests/test-obsolete.t b/tests/test-obsolete.t
--- a/tests/test-obsolete.t
+++ b/tests/test-obsolete.t
@@ -580,6 +580,7 @@
parent: 10:2033b4e49474
user: test
date: Thu Jan 01 00:00:00 1970 +0000
+ trouble: bumped
summary: add obsol_d'''
$ hg push ../other-new/
@@ -609,6 +610,7 @@
|/ parent: 10:2033b4e49474
| user: test
| date: Thu Jan 01 00:00:00 1970 +0000
+ | trouble: bumped
| summary: add obsol_d'''
|
| o changeset: 11:9468a5f5d8b2
@@ -672,6 +674,7 @@
parent: 10:2033b4e49474
user: test
date: Thu Jan 01 00:00:00 1970 +0000
+ trouble: bumped, divergent
summary: add obsol_d'''
changeset: 16:50f11e5e3a63
@@ -679,6 +682,7 @@
parent: 11:9468a5f5d8b2
user: test
date: Thu Jan 01 00:00:00 1970 +0000
+ trouble: divergent
summary: add obsolet_conflicting_d
@@ -716,12 +720,14 @@
| parent: 2:4538525df7e2
| user: test
| date: Thu Jan 01 00:00:00 1970 +0000
+ | trouble: unstable
| summary: add obsol_d''
|
| o changeset: 16:50f11e5e3a63
| | parent: 11:9468a5f5d8b2
| | user: test
| | date: Thu Jan 01 00:00:00 1970 +0000
+ | | trouble: divergent
| | summary: add obsolet_conflicting_d
| |
| | o changeset: 15:705ab2a6b72e
@@ -745,6 +751,7 @@
| | |/ parent: 10:2033b4e49474
| | | user: test
| | | date: Thu Jan 01 00:00:00 1970 +0000
+ | | | trouble: bumped, divergent
| | | summary: add obsol_d'''
| | |
| o | changeset: 11:9468a5f5d8b2
diff --git a/tests/test-stabilize-conflict.t b/tests/test-stabilize-conflict.t
--- a/tests/test-stabilize-conflict.t
+++ b/tests/test-stabilize-conflict.t
@@ -145,6 +145,7 @@
| o changeset: 5:71c18f70c34f
| | user: test
| | date: Thu Jan 01 00:00:00 1970 +0000
+ | | trouble: unstable
| | summary: babar count up to fifteen
| |
| x changeset: 4:5977072d13c5
@@ -235,6 +236,7 @@
| o changeset: 8:1836b91c6c1d
| | user: test
| | date: Thu Jan 01 00:00:00 1970 +0000
+ | | trouble: unstable
| | summary: babar count up to fifteen
| |
| x changeset: 7:e04690b09bc6
diff --git a/tests/test-stabilize-order.t b/tests/test-stabilize-order.t
--- a/tests/test-stabilize-order.t
+++ b/tests/test-stabilize-order.t
@@ -209,11 +209,13 @@
| | parent: 12:2256dae6521f
| | user: test
| | date: Thu Jan 01 00:00:00 1970 +0000
+ | | trouble: unstable
| | summary: secondambiguous
| |
| | o changeset: 13:bdc003b6eec2
| |/ user: test
| | date: Thu Jan 01 00:00:00 1970 +0000
+ | | trouble: unstable
| | summary: firstambiguous
| |
| x changeset: 12:2256dae6521f
More information about the Mercurial-devel
mailing list