Mercurial > evolve
diff tests/test-obsolete.t @ 2701:26ec0839865b mercurial-4.0
compat: merge with mercurial-4.1
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Sun, 02 Jul 2017 17:28:15 +0200 |
| parents | 44dd9d76afb2 52d5c5ce27e4 |
| children | 167567795f6c 13c4d518327a |
line wrap: on
line diff
--- a/tests/test-obsolete.t Sun Jul 02 18:22:39 2017 +0200 +++ b/tests/test-obsolete.t Sun Jul 02 17:28:15 2017 +0200 @@ -579,7 +579,6 @@ 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,7 +608,6 @@ |/ parent: 10:2033b4e49474 | user: test | date: Thu Jan 01 00:00:00 1970 +0000 - | trouble: bumped | summary: add obsol_d''' | | o changeset: 11:9468a5f5d8b2 @@ -673,7 +671,6 @@ parent: 10:2033b4e49474 user: test date: Thu Jan 01 00:00:00 1970 +0000 - trouble: bumped, divergent summary: add obsol_d''' changeset: 16:50f11e5e3a63 @@ -681,7 +678,6 @@ parent: 11:9468a5f5d8b2 user: test date: Thu Jan 01 00:00:00 1970 +0000 - trouble: divergent summary: add obsolet_conflicting_d @@ -721,14 +717,12 @@ | 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 @@ -752,7 +746,6 @@ | | |/ 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