# HG changeset patch # User Stanislau Hlebik # Date 1483608997 28800 # Node ID 3e270ed7ede06471c71968f148cbfc8e4ea60a54 # Parent ba9fabaca91b0897cffb7048d81193e44d440948 tests: fix tests to reflect hg core changes In f05ede08dcf7d13794ccc9abb53877a50bf2b58b in core hg there were changes to changeset_printer. diff -r ba9fabaca91b -r 3e270ed7ede0 tests/test-obsolete.t --- a/tests/test-obsolete.t Wed Nov 23 21:00:42 2016 +0530 +++ b/tests/test-obsolete.t Thu Jan 05 01:36:37 2017 -0800 @@ -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 -r ba9fabaca91b -r 3e270ed7ede0 tests/test-stabilize-conflict.t --- a/tests/test-stabilize-conflict.t Wed Nov 23 21:00:42 2016 +0530 +++ b/tests/test-stabilize-conflict.t Thu Jan 05 01:36:37 2017 -0800 @@ -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 -r ba9fabaca91b -r 3e270ed7ede0 tests/test-stabilize-order.t --- a/tests/test-stabilize-order.t Wed Nov 23 21:00:42 2016 +0530 +++ b/tests/test-stabilize-order.t Thu Jan 05 01:36:37 2017 -0800 @@ -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