Mercurial > evolve
diff tests/test-evolve-obshistory.t @ 3411:e1f3e43a50a4 stable
branching: backed out test output changes from core-1905aac253f0
This backs out evolve-ae6fddf39933
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Mon, 15 Jan 2018 19:52:00 +0100 |
| parents | 39112fd4d5ed |
| children | d3a17c67f85c 85cdce113c2c |
line wrap: on
line diff
--- a/tests/test-evolve-obshistory.t Mon Jan 15 19:42:44 2018 +0100 +++ b/tests/test-evolve-obshistory.t Mon Jan 15 19:52:00 2018 +0100 @@ -1054,7 +1054,7 @@ | instability: content-divergent | summary: A2 | - | * changeset: 2:fdf9bde5129a + | o changeset: 2:fdf9bde5129a |/ parent: 0:ea207398892e | user: test | date: Thu Jan 01 00:00:00 1970 +0000 @@ -1101,7 +1101,7 @@ $ hg obslog --hidden --all 471f378eab4c --patch @ 65b757b745b9 (3) A2 | - | * fdf9bde5129a (2) A1 + | o fdf9bde5129a (2) A1 |/ x 471f378eab4c (1) A0 rewritten(description) as 65b757b745b9 by test (*) (glob) @@ -1162,7 +1162,7 @@ Check that debugobshistory on the first diverged revision show the revision and the diverent one $ hg obslog fdf9bde5129a --patch - * fdf9bde5129a (2) A1 + o fdf9bde5129a (2) A1 | x 471f378eab4c (1) A0 rewritten(description) as 65b757b745b9 by test (*) (glob) @@ -1187,7 +1187,7 @@ $ hg obslog fdf9bde5129a -a --patch @ 65b757b745b9 (3) A2 | - | * fdf9bde5129a (2) A1 + | o fdf9bde5129a (2) A1 |/ x 471f378eab4c (1) A0 rewritten(description) as 65b757b745b9 by test (*) (glob) @@ -1234,7 +1234,7 @@ $ hg obslog 65b757b745b9 -a --patch @ 65b757b745b9 (3) A2 | - | * fdf9bde5129a (2) A1 + | o fdf9bde5129a (2) A1 |/ x 471f378eab4c (1) A0 rewritten(description) as 65b757b745b9 by test (*) (glob) @@ -1259,7 +1259,7 @@ $ hg obslog '65b757b745b9+fdf9bde5129a' --patch @ 65b757b745b9 (3) A2 | - | * fdf9bde5129a (2) A1 + | o fdf9bde5129a (2) A1 |/ x 471f378eab4c (1) A0 rewritten(description) as 65b757b745b9 by test (*) (glob)