Mercurial > evolve

comparison tests/test-topic-stack-data.t @ 2985:f63c97c01f92

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
topics/ui: signal when the topics command creates a new (empty) topic
author Aurélien Campéas
date Tue, 26 Sep 2017 12:29:15 +0200
parents 7759d040d48d
children 62201935e1a7
comparison
equal deleted inserted replaced
2984:30f6030dca8f 2985:f63c97c01f92
52 A simple topic that need rebasing 52 A simple topic that need rebasing
53 53
54 $ hg up 'desc(base_c)' 54 $ hg up 'desc(base_c)'
55 2 files updated, 0 files merged, 2 files removed, 0 files unresolved 55 2 files updated, 0 files merged, 2 files removed, 0 files unresolved
56 $ hg topic baz 56 $ hg topic baz
57 marked working directory as topic: baz
57 $ mkcommit baz_a 58 $ mkcommit baz_a
58 $ mkcommit baz_b 59 $ mkcommit baz_b
59 60
60 A simple topic with unstability 61 A simple topic with unstability
61 62
62 $ hg up 'desc(base_d)' 63 $ hg up 'desc(base_d)'
63 1 files updated, 0 files merged, 2 files removed, 0 files unresolved 64 1 files updated, 0 files merged, 2 files removed, 0 files unresolved
64 $ hg topic fuz 65 $ hg topic fuz
66 marked working directory as topic: fuz
65 $ mkcommit fuz_a 67 $ mkcommit fuz_a
66 $ mkcommit fuz_b 68 $ mkcommit fuz_b
67 $ mkcommit fuz_c 69 $ mkcommit fuz_c
68 $ hg up 'desc(fuz_a)' 70 $ hg up 'desc(fuz_a)'
69 0 files updated, 0 files merged, 2 files removed, 0 files unresolved 71 0 files updated, 0 files merged, 2 files removed, 0 files unresolved
72 A topic with multiple heads 74 A topic with multiple heads
73 75
74 $ hg up 'desc(base_e)' 76 $ hg up 'desc(base_e)'
75 1 files updated, 0 files merged, 1 files removed, 0 files unresolved 77 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
76 $ hg topic bar 78 $ hg topic bar
79 marked working directory as topic: bar
77 $ mkcommit bar_a 80 $ mkcommit bar_a
78 $ mkcommit bar_b 81 $ mkcommit bar_b
79 $ mkcommit bar_c 82 $ mkcommit bar_c
80 $ hg up 'desc(bar_b)' 83 $ hg up 'desc(bar_b)'
81 0 files updated, 0 files merged, 1 files removed, 0 files unresolved 84 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
88 topic 'foo' on the multi headed branch 91 topic 'foo' on the multi headed branch
89 92
90 $ hg up 'desc(lake_a)' 93 $ hg up 'desc(lake_a)'
91 1 files updated, 0 files merged, 7 files removed, 0 files unresolved 94 1 files updated, 0 files merged, 7 files removed, 0 files unresolved
92 $ hg topic foo 95 $ hg topic foo
96 marked working directory as topic: foo
93 $ mkcommit foo_a 97 $ mkcommit foo_a
94 $ mkcommit foo_b 98 $ mkcommit foo_b
95 99
96 Summary 100 Summary
97 ------- 101 -------