Mercurial > evolve
comparison tests/test-topic-stack-data.t @ 3431:2e703ed1c713
evolve: update output for wider reporting of troubled changesets
CORE-TEST-OUTPUT-UPDATE: 1a09dad8b85a
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Sat, 13 Jan 2018 14:35:49 -0800 |
parents | d3a17c67f85c |
children | d5adce52cef4 1bc4b0807c37 |
comparison
equal
deleted
inserted
replaced
3430:14fbb847be5a | 3431:2e703ed1c713 |
---|---|
71 $ mkcommit fuz_b | 71 $ mkcommit fuz_b |
72 $ mkcommit fuz_c | 72 $ mkcommit fuz_c |
73 $ hg up 'desc(fuz_a)' | 73 $ hg up 'desc(fuz_a)' |
74 0 files updated, 0 files merged, 2 files removed, 0 files unresolved | 74 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
75 $ hg commit --amend --message 'fuz1_a' | 75 $ hg commit --amend --message 'fuz1_a' |
76 2 new orphan changesets | |
76 | 77 |
77 A topic with multiple heads | 78 A topic with multiple heads |
78 | 79 |
79 $ hg up 'desc(base_e)' | 80 $ hg up 'desc(base_e)' |
80 1 files updated, 0 files merged, 1 files removed, 0 files unresolved | 81 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
89 $ mkcommit bar_d | 90 $ mkcommit bar_d |
90 $ mkcommit bar_e | 91 $ mkcommit bar_e |
91 $ hg up 'desc(bar_d)' | 92 $ hg up 'desc(bar_d)' |
92 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | 93 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
93 $ hg commit --amend --message 'bar1_d' | 94 $ hg commit --amend --message 'bar1_d' |
95 1 new orphan changesets | |
94 | 96 |
95 topic 'foo' on the multi headed branch | 97 topic 'foo' on the multi headed branch |
96 | 98 |
97 $ hg up 'desc(lake_a)' | 99 $ hg up 'desc(lake_a)' |
98 1 files updated, 0 files merged, 7 files removed, 0 files unresolved | 100 1 files updated, 0 files merged, 7 files removed, 0 files unresolved |