Mercurial > evolve
comparison tests/test-topic-stack-complex.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 | ae6fddf39933 |
| children | 85cdce113c2c d3a17c67f85c |
comparison
equal
deleted
inserted
replaced
| 3410:39112fd4d5ed | 3411:e1f3e43a50a4 |
|---|---|
| 92 t0^ Added foo (base) | 92 t0^ Added foo (base) |
| 93 | 93 |
| 94 $ hg show work | 94 $ hg show work |
| 95 @ 5cce (foo) split2 | 95 @ 5cce (foo) split2 |
| 96 o f26c (foo) split1 | 96 o f26c (foo) split1 |
| 97 | * f1d3 (foo) Added e and f | 97 | o f1d3 (foo) Added e and f |
| 98 | x 8e82 (foo) Added c and d | 98 | x 8e82 (foo) Added c and d |
| 99 |/ | 99 |/ |
| 100 o 002b (foo) Added a and b | 100 o 002b (foo) Added a and b |
| 101 o f360 Added foo | 101 o f360 Added foo |
| 102 | 102 |
| 114 | 114 |
| 115 $ hg amend | 115 $ hg amend |
| 116 1 new orphan changesets | 116 1 new orphan changesets |
| 117 $ hg show work | 117 $ hg show work |
| 118 @ 7d94 (foo) split1 | 118 @ 7d94 (foo) split1 |
| 119 | * 5cce (foo) split2 | 119 | o 5cce (foo) split2 |
| 120 | x f26c (foo) split1 | 120 | x f26c (foo) split1 |
| 121 |/ | 121 |/ |
| 122 | * f1d3 (foo) Added e and f | 122 | o f1d3 (foo) Added e and f |
| 123 | x 8e82 (foo) Added c and d | 123 | x 8e82 (foo) Added c and d |
| 124 |/ | 124 |/ |
| 125 o 002b (foo) Added a and b | 125 o 002b (foo) Added a and b |
| 126 o f360 Added foo | 126 o f360 Added foo |
| 127 | 127 |