Mercurial > evolve
diff tests/test-evolve-obshistory-phase-divergent.t @ 3936:537fd9a86c06 mercurial-4.3
test-compat: merge mercurial-4.4 into mercurial-4.3
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Fri, 03 Aug 2018 00:22:50 +0200 |
| parents | d00f0c369bc7 |
| children |
line wrap: on
line diff
--- a/tests/test-evolve-obshistory-phase-divergent.t Fri Aug 03 00:19:47 2018 +0200 +++ b/tests/test-evolve-obshistory-phase-divergent.t Fri Aug 03 00:22:50 2018 +0200 @@ -28,7 +28,7 @@ | x changeset: 1:471f378eab4c |/ user: test | date: Thu Jan 01 00:00:00 1970 +0000 - | obsolete: reworded using amend as 2:fdf9bde5129a + | obsolete: reworded as fdf9bde5129a | summary: A0 | o changeset: 0:ea207398892e @@ -41,14 +41,14 @@ working directory parent is obsolete! (471f378eab4c) (use 'hg evolve' to update to its successor: fdf9bde5129a) $ hg phase -p . - 1 new phase-divergent changesets + 1 new bumped changesets $ hg log --hidden -G o changeset: 2:fdf9bde5129a | tag: tip | parent: 0:ea207398892e | user: test | date: Thu Jan 01 00:00:00 1970 +0000 - | instability: phase-divergent + | trouble: bumped | summary: A1 | | @ changeset: 1:471f378eab4c @@ -67,7 +67,7 @@ Check that debugobshistory on the divergent revision show both destinations $ hg obslog --hidden 471f378eab4c --patch @ 471f378eab4c (1) A0 - rewritten(description) as fdf9bde5129a using amend by test (Thu Jan 01 00:00:00 1970 +0000) + rewritten(description) as fdf9bde5129a by test (Thu Jan 01 00:00:00 1970 +0000) diff -r 471f378eab4c -r fdf9bde5129a changeset-description --- a/changeset-description +++ b/changeset-description @@ -82,7 +82,7 @@ o fdf9bde5129a (2) A1 | @ 471f378eab4c (1) A0 - rewritten(description) as fdf9bde5129a using amend by test (Thu Jan 01 00:00:00 1970 +0000) + rewritten(description) as fdf9bde5129a by test (Thu Jan 01 00:00:00 1970 +0000) diff -r 471f378eab4c -r fdf9bde5129a changeset-description --- a/changeset-description +++ b/changeset-description @@ -103,7 +103,6 @@ "effect": [ "description" ], - "operation": "amend", "succnodes": [ "fdf9bde5129a" ], @@ -122,7 +121,7 @@ o fdf9bde5129a (2) A1 | @ 471f378eab4c (1) A0 - rewritten(description) as fdf9bde5129a using amend by test (Thu Jan 01 00:00:00 1970 +0000) + rewritten(description) as fdf9bde5129a by test (Thu Jan 01 00:00:00 1970 +0000) diff -r 471f378eab4c -r fdf9bde5129a changeset-description --- a/changeset-description +++ b/changeset-description @@ -137,7 +136,7 @@ o fdf9bde5129a (2) A1 | @ 471f378eab4c (1) A0 - rewritten(description) as fdf9bde5129a using amend by test (Thu Jan 01 00:00:00 1970 +0000) + rewritten(description) as fdf9bde5129a by test (Thu Jan 01 00:00:00 1970 +0000) diff -r 471f378eab4c -r fdf9bde5129a changeset-description --- a/changeset-description +++ b/changeset-description @@ -152,7 +151,7 @@ o fdf9bde5129a (2) A1 | @ 471f378eab4c (1) A0 - rewritten(description) as fdf9bde5129a using amend by test (Thu Jan 01 00:00:00 1970 +0000) + rewritten(description) as fdf9bde5129a by test (Thu Jan 01 00:00:00 1970 +0000) diff -r 471f378eab4c -r fdf9bde5129a changeset-description --- a/changeset-description +++ b/changeset-description @@ -166,7 +165,7 @@ o fdf9bde5129a (2) A1 | @ 471f378eab4c (1) A0 - rewritten(description) as fdf9bde5129a using amend by test (Thu Jan 01 00:00:00 1970 +0000) + rewritten(description) as fdf9bde5129a by test (Thu Jan 01 00:00:00 1970 +0000) diff -r 471f378eab4c -r fdf9bde5129a changeset-description --- a/changeset-description +++ b/changeset-description @@ -181,7 +180,7 @@ o fdf9bde5129a (2) A1 | @ 471f378eab4c (1) A0 - rewritten(description) as fdf9bde5129a using amend by test (Thu Jan 01 00:00:00 1970 +0000) + rewritten(description) as fdf9bde5129a by test (Thu Jan 01 00:00:00 1970 +0000) diff -r 471f378eab4c -r fdf9bde5129a changeset-description --- a/changeset-description +++ b/changeset-description @@ -208,7 +207,6 @@ "effect": [ "description" ], - "operation": "amend", "succnodes": [ "fdf9bde5129a" ],