Mercurial > evolve
diff tests/test-topic-stack-data.t @ 3930:d00f0c369bc7 mercurial-4.4
test-compat: merge mercurial-4.5 into mercurial-4.4
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Thu, 02 Aug 2018 02:47:44 +0200 |
| parents | d5adce52cef4 1bc4b0807c37 |
| children | 537fd9a86c06 f9a850018daa |
line wrap: on
line diff
--- a/tests/test-topic-stack-data.t Thu Aug 02 02:42:15 2018 +0200 +++ b/tests/test-topic-stack-data.t Thu Aug 02 02:47:44 2018 +0200 @@ -75,7 +75,6 @@ $ hg up 'desc(fuz_a)' 0 files updated, 0 files merged, 2 files removed, 0 files unresolved $ hg commit --amend --message 'fuz1_a' - 2 new orphan changesets A topic with multiple heads @@ -95,7 +94,6 @@ $ hg up 'desc(bar_d)' 0 files updated, 0 files merged, 1 files removed, 0 files unresolved $ hg commit --amend --message 'bar1_d' - 1 new orphan changesets topic 'foo' on the multi headed branch @@ -127,7 +125,7 @@ | | o bar1_d (default) [bar] | | - | | * add bar_e (default) [bar] + | | o add bar_e (default) [bar] | | | | | x add bar_d (default) [bar] | |/ @@ -139,9 +137,9 @@ | | | | o fuz1_a (default) [fuz] | | | - | | | * add fuz_c (default) [fuz] + | | | o add fuz_c (default) [fuz] | | | | - | | | * add fuz_b (default) [fuz] + | | | o add fuz_b (default) [fuz] | | | | | | | x add fuz_a (default) [fuz] | | |/