Mercurial > evolve

comparison tests/test-topic-stack-data.t @ 3914:96945ea908df stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
branching: merge default into stable The stable branch of Mercurial core now contains Mercurial 4.7 so evolve branch policy requires this merge. The @ bookmark is in the right location, so people doing clone will get to the latest release.
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Tue, 31 Jul 2018 12:52:06 +0200
parents 1bc4b0807c37
children d00f0c369bc7 fb4801478d5d
comparison
equal deleted inserted replaced
3901:f2b8429db565 3914:96945ea908df
56 2 files updated, 0 files merged, 2 files removed, 0 files unresolved 56 2 files updated, 0 files merged, 2 files removed, 0 files unresolved
57 $ hg topic baz 57 $ hg topic baz
58 marked working directory as topic: baz 58 marked working directory as topic: baz
59 $ mkcommit baz_a 59 $ mkcommit baz_a
60 active topic 'baz' grew its first changeset 60 active topic 'baz' grew its first changeset
61 (see 'hg help topics' for more information)
61 $ mkcommit baz_b 62 $ mkcommit baz_b
62 63
63 A simple topic with unstability 64 A simple topic with unstability
64 65
65 $ hg up 'desc(base_d)' 66 $ hg up 'desc(base_d)'
66 1 files updated, 0 files merged, 2 files removed, 0 files unresolved 67 1 files updated, 0 files merged, 2 files removed, 0 files unresolved
67 $ hg topic fuz 68 $ hg topic fuz
68 marked working directory as topic: fuz 69 marked working directory as topic: fuz
69 $ mkcommit fuz_a 70 $ mkcommit fuz_a
70 active topic 'fuz' grew its first changeset 71 active topic 'fuz' grew its first changeset
72 (see 'hg help topics' for more information)
71 $ mkcommit fuz_b 73 $ mkcommit fuz_b
72 $ mkcommit fuz_c 74 $ mkcommit fuz_c
73 $ hg up 'desc(fuz_a)' 75 $ hg up 'desc(fuz_a)'
74 0 files updated, 0 files merged, 2 files removed, 0 files unresolved 76 0 files updated, 0 files merged, 2 files removed, 0 files unresolved
75 $ hg commit --amend --message 'fuz1_a' 77 $ hg commit --amend --message 'fuz1_a'
81 1 files updated, 0 files merged, 1 files removed, 0 files unresolved 83 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
82 $ hg topic bar 84 $ hg topic bar
83 marked working directory as topic: bar 85 marked working directory as topic: bar
84 $ mkcommit bar_a 86 $ mkcommit bar_a
85 active topic 'bar' grew its first changeset 87 active topic 'bar' grew its first changeset
88 (see 'hg help topics' for more information)
86 $ mkcommit bar_b 89 $ mkcommit bar_b
87 $ mkcommit bar_c 90 $ mkcommit bar_c
88 $ hg up 'desc(bar_b)' 91 $ hg up 'desc(bar_b)'
89 0 files updated, 0 files merged, 1 files removed, 0 files unresolved 92 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
90 $ mkcommit bar_d 93 $ mkcommit bar_d
100 1 files updated, 0 files merged, 7 files removed, 0 files unresolved 103 1 files updated, 0 files merged, 7 files removed, 0 files unresolved
101 $ hg topic foo 104 $ hg topic foo
102 marked working directory as topic: foo 105 marked working directory as topic: foo
103 $ mkcommit foo_a 106 $ mkcommit foo_a
104 active topic 'foo' grew its first changeset 107 active topic 'foo' grew its first changeset
108 (see 'hg help topics' for more information)
105 $ mkcommit foo_b 109 $ mkcommit foo_b
106 110
107 Summary 111 Summary
108 ------- 112 -------
109 113