Mercurial > hg > evolve

annotate tests/test-topic-change.t @ 6137:2800aa3c3dbf

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
topic: drop the old workaround for detecting amends by amend_source We don't need to have this workaround because amends are handled differently now. See previous commits, where the old code for handling amends in topic extension gets removed. Various commits now preserve amend_source when going through the _changetopics function (used when changing a topic via the hg topics command).
author Anton Shestakov <av6@dwimlabs.net>
date Mon, 30 Aug 2021 12:05:14 +0300
parents c3d66af4cb07
children c0921b5277a0 2fbe91d762ef
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
3133
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
1 Tests for changing and clearing topics
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
2 ======================================
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
3
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
4 $ . "$TESTDIR/testlib/topic_setup.sh"
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
5 $ cat <<EOF >> $HGRCPATH
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
6 > [experimental]
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
7 > evolution=createmarkers, allowunstable
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
8 > [phases]
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
9 > publish=false
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
10 > [alias]
3489
2b06f144b6e0 topics: add a new templatekeyword `topic`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3464
diff changeset
11 > glog = log -G -T "{rev}:{node|short} \{{topic}}\n{desc} ({bookmarks})\n\n"
3133
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
12 > EOF
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
13
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
14 About the glog output: {} contains the topic name and () will contain the bookmark
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
15
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
16 Setting up a repo
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
17 ----------------
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
18
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
19 $ hg init topics
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
20 $ cd topics
3137
e162597b375a test: remove bashism in test-topic-change.t
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3136
diff changeset
21 $ for ch in a b c d e f g h; do touch $ch; echo "foo" >> $ch; hg ci -Aqm "Added "$ch; done
3133
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
22
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
23 $ hg glog
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
24 @ 7:ec2426147f0e {}
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
25 | Added h ()
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
26 |
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
27 o 6:87d6d6676308 {}
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
28 | Added g ()
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
29 |
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
30 o 5:825660c69f0c {}
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
31 | Added f ()
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
32 |
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
33 o 4:aa98ab95a928 {}
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
34 | Added e ()
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
35 |
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
36 o 3:62615734edd5 {}
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
37 | Added d ()
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
38 |
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
39 o 2:28ad74487de9 {}
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
40 | Added c ()
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
41 |
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
42 o 1:29becc82797a {}
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
43 | Added b ()
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
44 |
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
45 o 0:18d04c59bb5d {}
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
46 Added a ()
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
47
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
48
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
49 Clearing topic from revision without topic
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
50
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
51 $ hg topic -r . --clear
4373
d5a2cc19903f topics: improve the message around topic changing
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 3874
diff changeset
52 cleared topic on 0 changesets
3133
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
53
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
54 Clearing current topic when no active topic is not error
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
55
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
56 $ hg topic
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
57 $ hg topic --clear
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
58
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
59 Setting topics to all the revisions
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
60
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
61 $ hg topic -r 0:: foo
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
62 switching to topic foo
4373
d5a2cc19903f topics: improve the message around topic changing
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 3874
diff changeset
63 changed topic on 8 changesets to "foo"
3133
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
64 $ hg glog
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
65 @ 15:05095f607171 {foo}
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
66 | Added h ()
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
67 |
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
68 o 14:97505b53ab0d {foo}
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
69 | Added g ()
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
70 |
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
71 o 13:75a8360fe626 {foo}
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
72 | Added f ()
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
73 |
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
74 o 12:abcedffeae90 {foo}
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
75 | Added e ()
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
76 |
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
77 o 11:1315a3808ed0 {foo}
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
78 | Added d ()
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
79 |
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
80 o 10:1fa891977a22 {foo}
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
81 | Added c ()
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
82 |
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
83 o 9:a53ba98dd6b8 {foo}
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
84 | Added b ()
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
85 |
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
86 o 8:86a186070af2 {foo}
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
87 Added a ()
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
88
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
89
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
90 Clearing the active topic using --clear
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
91
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
92 $ hg topic
3156
f43a310c4338 topics: show changesetcount, troubledcount and headscount by default
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3137
diff changeset
93 * foo (8 changesets)
3133
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
94 $ hg topic --clear
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
95 $ hg topic
3156
f43a310c4338 topics: show changesetcount, troubledcount and headscount by default
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3137
diff changeset
96 foo (8 changesets)
3133
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
97 Changing topics on some revisions (also testing issue 5441)
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
98
3685
031d70bcbb42 test: do not use revision number
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3536
diff changeset
99 $ hg topic -r abcedffeae90:: bar
3133
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
100 switching to topic bar
4373
d5a2cc19903f topics: improve the message around topic changing
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 3874
diff changeset
101 changed topic on 4 changesets to "bar"
3133
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
102 $ hg glog
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
103 @ 19:d7d36e193ea7 {bar}
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
104 | Added h ()
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
105 |
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
106 o 18:e7b418d79a05 {bar}
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
107 | Added g ()
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
108 |
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
109 o 17:82e0b14f4d9e {bar}
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
110 | Added f ()
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
111 |
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
112 o 16:edc4a6b9ea60 {bar}
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
113 | Added e ()
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
114 |
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
115 o 11:1315a3808ed0 {foo}
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
116 | Added d ()
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
117 |
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
118 o 10:1fa891977a22 {foo}
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
119 | Added c ()
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
120 |
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
121 o 9:a53ba98dd6b8 {foo}
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
122 | Added b ()
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
123 |
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
124 o 8:86a186070af2 {foo}
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
125 Added a ()
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
126
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
127
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
128 Changing topics without passing topic name and clear
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
129
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
130 $ hg topic -r .
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
131 abort: changing topic requires a topic name or --clear
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
132 [255]
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
133
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
134 Changing topic using --current flag
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
135
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
136 $ hg topic foobar
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
137 $ hg topic -r . --current
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
138 active topic 'foobar' grew its first changeset
3874
1bc4b0807c37 topic: display a hint pointing at help when a topic becomes non-empty
Denis Laxalde <denis.laxalde@logilab.fr>
parents: 3685
diff changeset
139 (see 'hg help topics' for more information)
4373
d5a2cc19903f topics: improve the message around topic changing
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 3874
diff changeset
140 changed topic on 1 changesets to "foobar"
3133
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
141 $ hg glog -r .
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
142 @ 20:c2d6b7df5dcf {foobar}
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
143 | Added h ()
6074
f8ab6ad1ffc0 tests: drop 3.7 compatibility for log -G missing parent edge
Anton Shestakov <av6@dwimlabs.net>
parents: 5752
diff changeset
144 ~
3133
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
145
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
146 Changing topic in between the stack
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
147
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
148 $ hg topic -r 9::10 --current
3536
2e703ed1c713 evolve: update output for wider reporting of troubled changesets
Martin von Zweigbergk <martinvonz@google.com>
parents: 3522
diff changeset
149 5 new orphan changesets
4373
d5a2cc19903f topics: improve the message around topic changing
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 3874
diff changeset
150 changed topic on 2 changesets to "foobar"
3133
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
151 $ hg glog
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
152 o 22:1b88140feefe {foobar}
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
153 | Added c ()
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
154 |
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
155 o 21:c39cabfcbbf7 {foobar}
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
156 | Added b ()
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
157 |
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
158 | @ 20:c2d6b7df5dcf {foobar}
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
159 | | Added h ()
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
160 | |
3522
d3a17c67f85c branching: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3516
diff changeset
161 | * 18:e7b418d79a05 {bar}
3133
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
162 | | Added g ()
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
163 | |
3522
d3a17c67f85c branching: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3516
diff changeset
164 | * 17:82e0b14f4d9e {bar}
3133
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
165 | | Added f ()
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
166 | |
3522
d3a17c67f85c branching: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3516
diff changeset
167 | * 16:edc4a6b9ea60 {bar}
3133
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
168 | | Added e ()
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
169 | |
3522
d3a17c67f85c branching: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3516
diff changeset
170 | * 11:1315a3808ed0 {foo}
3133
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
171 | | Added d ()
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
172 | |
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
173 | x 10:1fa891977a22 {foo}
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
174 | | Added c ()
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
175 | |
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
176 | x 9:a53ba98dd6b8 {foo}
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
177 |/ Added b ()
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
178 |
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
179 o 8:86a186070af2 {foo}
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
180 Added a ()
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
181
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
182 $ hg rebase -s 11 -d 22
5752
c2fab88e6d60 tests: rebase now produces different "one-line summary" output
Martin von Zweigbergk <martinvonz@google.com>
parents: 4373
diff changeset
183 rebasing 11:1315a3808ed0 foo "Added d"
3133
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
184 switching to topic foo
5752
c2fab88e6d60 tests: rebase now produces different "one-line summary" output
Martin von Zweigbergk <martinvonz@google.com>
parents: 4373
diff changeset
185 rebasing 16:edc4a6b9ea60 bar "Added e"
3133
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
186 switching to topic bar
5752
c2fab88e6d60 tests: rebase now produces different "one-line summary" output
Martin von Zweigbergk <martinvonz@google.com>
parents: 4373
diff changeset
187 rebasing 17:82e0b14f4d9e bar "Added f"
c2fab88e6d60 tests: rebase now produces different "one-line summary" output
Martin von Zweigbergk <martinvonz@google.com>
parents: 4373
diff changeset
188 rebasing 18:e7b418d79a05 bar "Added g"
c2fab88e6d60 tests: rebase now produces different "one-line summary" output
Martin von Zweigbergk <martinvonz@google.com>
parents: 4373
diff changeset
189 rebasing 20:c2d6b7df5dcf foobar "Added h"
3133
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
190 switching to topic foobar
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
191
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
192 $ hg glog
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
193 @ 27:a1a9465da59b {foobar}
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
194 | Added h ()
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
195 |
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
196 o 26:7c76c271395f {bar}
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
197 | Added g ()
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
198 |
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
199 o 25:7f26084dfaf1 {bar}
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
200 | Added f ()
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
201 |
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
202 o 24:b1f05e9ba0b5 {bar}
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
203 | Added e ()
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
204 |
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
205 o 23:f9869da2286e {foo}
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
206 | Added d ()
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
207 |
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
208 o 22:1b88140feefe {foobar}
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
209 | Added c ()
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
210 |
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
211 o 21:c39cabfcbbf7 {foobar}
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
212 | Added b ()
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
213 |
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
214 o 8:86a186070af2 {foo}
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
215 Added a ()
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
216
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
217 Amending a topic
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
218 ----------------
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
219
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
220 When the changeset has a topic and we have different active topic
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
221
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
222 $ hg topic wat
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
223 $ hg ci --amend
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
224 active topic 'wat' grew its first changeset
3874
1bc4b0807c37 topic: display a hint pointing at help when a topic becomes non-empty
Denis Laxalde <denis.laxalde@logilab.fr>
parents: 3685
diff changeset
225 (see 'hg help topics' for more information)
3133
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
226 $ hg glog -r .
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
227 @ 28:61470c956807 {wat}
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
228 | Added h ()
6074
f8ab6ad1ffc0 tests: drop 3.7 compatibility for log -G missing parent edge
Anton Shestakov <av6@dwimlabs.net>
parents: 5752
diff changeset
229 ~
3133
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
230
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
231 Clear the current topic and amending
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
232
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
233 $ hg topic --clear
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
234 $ hg ci --amend
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
235 $ hg glog -r .
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
236 @ 29:b584fa49f42e {}
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
237 | Added h ()
6074
f8ab6ad1ffc0 tests: drop 3.7 compatibility for log -G missing parent edge
Anton Shestakov <av6@dwimlabs.net>
parents: 5752
diff changeset
238 ~
3133
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
239
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
240 When the changeset does not has a topic but we have an active topic
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
241
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
242 $ hg topic watwat
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
243 marked working directory as topic: watwat
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
244 $ hg ci --amend
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
245 active topic 'watwat' grew its first changeset
3874
1bc4b0807c37 topic: display a hint pointing at help when a topic becomes non-empty
Denis Laxalde <denis.laxalde@logilab.fr>
parents: 3685
diff changeset
246 (see 'hg help topics' for more information)
3133
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
247 $ hg glog -r .
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
248 @ 30:a24c31c35013 {watwat}
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
249 | Added h ()
6074
f8ab6ad1ffc0 tests: drop 3.7 compatibility for log -G missing parent edge
Anton Shestakov <av6@dwimlabs.net>
parents: 5752
diff changeset
250 ~
3133
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
251
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
252 Testing changing topics on public changeset
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
253 -------------------------------------------
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
254
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
255 $ hg phase -r 8 -p
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
256
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
257 Clearing the topic
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
258
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
259 $ hg topic -r 8 --clear
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
260 abort: can't change topic of a public change
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
261 [255]
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
262
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
263 Changing the topic
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
264
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
265 $ hg topic -r 8 foobarboo
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
266 abort: can't change topic of a public change
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
267 [255]
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
268
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
269 Testing the bookmark movement
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
270 -----------------------------
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
271
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
272 $ hg bookmark book
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
273 $ hg glog
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
274 @ 30:a24c31c35013 {watwat}
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
275 | Added h (book)
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
276 |
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
277 o 26:7c76c271395f {bar}
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
278 | Added g ()
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
279 |
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
280 o 25:7f26084dfaf1 {bar}
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
281 | Added f ()
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
282 |
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
283 o 24:b1f05e9ba0b5 {bar}
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
284 | Added e ()
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
285 |
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
286 o 23:f9869da2286e {foo}
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
287 | Added d ()
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
288 |
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
289 o 22:1b88140feefe {foobar}
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
290 | Added c ()
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
291 |
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
292 o 21:c39cabfcbbf7 {foobar}
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
293 | Added b ()
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
294 |
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
295 o 8:86a186070af2 {}
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
296 Added a ()
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
297
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
298 On clearing the topic
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
299
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
300 $ hg topic -r . --clear
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
301 clearing empty topic "watwat"
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
302 active topic 'watwat' is now empty
4373
d5a2cc19903f topics: improve the message around topic changing
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 3874
diff changeset
303 cleared topic on 1 changesets
3133
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
304
6136
c3d66af4cb07 tests: show extras that are going to change in the next patch
Anton Shestakov <av6@dwimlabs.net>
parents: 6074
diff changeset
305 $ hg log -r . -T '{rev}: {join(extras, " ")}\n'
6137
2800aa3c3dbf topic: drop the old workaround for detecting amends by amend_source
Anton Shestakov <av6@dwimlabs.net>
parents: 6136
diff changeset
306 31: _rewrite_noise=[0-9a-f]+ amend_source=[0-9a-f]+ branch=default rebase_source=[0-9a-f]+ (re)
3133
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
307 $ hg glog
6137
2800aa3c3dbf topic: drop the old workaround for detecting amends by amend_source
Anton Shestakov <av6@dwimlabs.net>
parents: 6136
diff changeset
308 @ 31:fb090538b75b {}
3134
103244e34a9c topics: use scmutil.cleanupnodes to create markers while changing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3133
diff changeset
309 | Added h (book)
3133
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
310 |
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
311 o 26:7c76c271395f {bar}
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
312 | Added g ()
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
313 |
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
314 o 25:7f26084dfaf1 {bar}
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
315 | Added f ()
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
316 |
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
317 o 24:b1f05e9ba0b5 {bar}
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
318 | Added e ()
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
319 |
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
320 o 23:f9869da2286e {foo}
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
321 | Added d ()
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
322 |
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
323 o 22:1b88140feefe {foobar}
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
324 | Added c ()
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
325 |
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
326 o 21:c39cabfcbbf7 {foobar}
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
327 | Added b ()
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
328 |
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
329 o 8:86a186070af2 {}
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
330 Added a ()
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
331
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
332
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
333 On changing the topic
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
334
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
335 $ hg bookmark bookboo
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
336 $ hg topic -r . movebook
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
337 switching to topic movebook
4373
d5a2cc19903f topics: improve the message around topic changing
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 3874
diff changeset
338 changed topic on 1 changesets to "movebook"
6136
c3d66af4cb07 tests: show extras that are going to change in the next patch
Anton Shestakov <av6@dwimlabs.net>
parents: 6074
diff changeset
339 $ hg log -r . -T '{rev}: {join(extras, " ")}\n'
6137
2800aa3c3dbf topic: drop the old workaround for detecting amends by amend_source
Anton Shestakov <av6@dwimlabs.net>
parents: 6136
diff changeset
340 32: _rewrite_noise=[0-9a-f]+ amend_source=[0-9a-f]+ branch=default rebase_source=[0-9a-f]+ topic=movebook (re)
3133
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
341 $ hg glog
6137
2800aa3c3dbf topic: drop the old workaround for detecting amends by amend_source
Anton Shestakov <av6@dwimlabs.net>
parents: 6136
diff changeset
342 @ 32:3955a85a6349 {movebook}
3134
103244e34a9c topics: use scmutil.cleanupnodes to create markers while changing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3133
diff changeset
343 | Added h (book bookboo)
3133
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
344 |
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
345 o 26:7c76c271395f {bar}
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
346 | Added g ()
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
347 |
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
348 o 25:7f26084dfaf1 {bar}
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
349 | Added f ()
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
350 |
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
351 o 24:b1f05e9ba0b5 {bar}
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
352 | Added e ()
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
353 |
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
354 o 23:f9869da2286e {foo}
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
355 | Added d ()
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
356 |
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
357 o 22:1b88140feefe {foobar}
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
358 | Added c ()
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
359 |
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
360 o 21:c39cabfcbbf7 {foobar}
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
361 | Added b ()
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
362 |
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
363 o 8:86a186070af2 {}
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
364 Added a ()
5c8d5f980f49 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
365
3135
5b24ed4b3e9c tests: add test showing change of phase while changing topic on secret commit
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3134
diff changeset
366 Changing topic on secret changesets
5b24ed4b3e9c tests: add test showing change of phase while changing topic on secret commit
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3134
diff changeset
367 -----------------------------------
5b24ed4b3e9c tests: add test showing change of phase while changing topic on secret commit
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3134
diff changeset
368
5b24ed4b3e9c tests: add test showing change of phase while changing topic on secret commit
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3134
diff changeset
369 $ hg up 26
5b24ed4b3e9c tests: add test showing change of phase while changing topic on secret commit
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3134
diff changeset
370 switching to topic bar
5b24ed4b3e9c tests: add test showing change of phase while changing topic on secret commit
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3134
diff changeset
371 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
5b24ed4b3e9c tests: add test showing change of phase while changing topic on secret commit
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3134
diff changeset
372 (leaving bookmark bookboo)
5b24ed4b3e9c tests: add test showing change of phase while changing topic on secret commit
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3134
diff changeset
373
5b24ed4b3e9c tests: add test showing change of phase while changing topic on secret commit
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3134
diff changeset
374 $ hg phase -r . -s -f
5b24ed4b3e9c tests: add test showing change of phase while changing topic on secret commit
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3134
diff changeset
375 $ hg phase -r .
5b24ed4b3e9c tests: add test showing change of phase while changing topic on secret commit
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3134
diff changeset
376 26: secret
5b24ed4b3e9c tests: add test showing change of phase while changing topic on secret commit
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3134
diff changeset
377
5b24ed4b3e9c tests: add test showing change of phase while changing topic on secret commit
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3134
diff changeset
378 $ hg topic -r . watwat
5b24ed4b3e9c tests: add test showing change of phase while changing topic on secret commit
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3134
diff changeset
379 switching to topic watwat
3536
2e703ed1c713 evolve: update output for wider reporting of troubled changesets
Martin von Zweigbergk <martinvonz@google.com>
parents: 3522
diff changeset
380 1 new orphan changesets
4373
d5a2cc19903f topics: improve the message around topic changing
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 3874
diff changeset
381 changed topic on 1 changesets to "watwat"
3135
5b24ed4b3e9c tests: add test showing change of phase while changing topic on secret commit
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3134
diff changeset
382
5b24ed4b3e9c tests: add test showing change of phase while changing topic on secret commit
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3134
diff changeset
383 $ hg glog
5b24ed4b3e9c tests: add test showing change of phase while changing topic on secret commit
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3134
diff changeset
384 @ 33:894983f69e69 {watwat}
5b24ed4b3e9c tests: add test showing change of phase while changing topic on secret commit
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3134
diff changeset
385 | Added g ()
5b24ed4b3e9c tests: add test showing change of phase while changing topic on secret commit
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3134
diff changeset
386 |
6137
2800aa3c3dbf topic: drop the old workaround for detecting amends by amend_source
Anton Shestakov <av6@dwimlabs.net>
parents: 6136
diff changeset
387 | * 32:3955a85a6349 {movebook}
3135
5b24ed4b3e9c tests: add test showing change of phase while changing topic on secret commit
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3134
diff changeset
388 | | Added h (book bookboo)
5b24ed4b3e9c tests: add test showing change of phase while changing topic on secret commit
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3134
diff changeset
389 | |
5b24ed4b3e9c tests: add test showing change of phase while changing topic on secret commit
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3134
diff changeset
390 | x 26:7c76c271395f {bar}
5b24ed4b3e9c tests: add test showing change of phase while changing topic on secret commit
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3134
diff changeset
391 |/ Added g ()
5b24ed4b3e9c tests: add test showing change of phase while changing topic on secret commit
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3134
diff changeset
392 |
5b24ed4b3e9c tests: add test showing change of phase while changing topic on secret commit
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3134
diff changeset
393 o 25:7f26084dfaf1 {bar}
5b24ed4b3e9c tests: add test showing change of phase while changing topic on secret commit
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3134
diff changeset
394 | Added f ()
5b24ed4b3e9c tests: add test showing change of phase while changing topic on secret commit
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3134
diff changeset
395 |
5b24ed4b3e9c tests: add test showing change of phase while changing topic on secret commit
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3134
diff changeset
396 o 24:b1f05e9ba0b5 {bar}
5b24ed4b3e9c tests: add test showing change of phase while changing topic on secret commit
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3134
diff changeset
397 | Added e ()
5b24ed4b3e9c tests: add test showing change of phase while changing topic on secret commit
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3134
diff changeset
398 |
5b24ed4b3e9c tests: add test showing change of phase while changing topic on secret commit
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3134
diff changeset
399 o 23:f9869da2286e {foo}
5b24ed4b3e9c tests: add test showing change of phase while changing topic on secret commit
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3134
diff changeset
400 | Added d ()
5b24ed4b3e9c tests: add test showing change of phase while changing topic on secret commit
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3134
diff changeset
401 |
5b24ed4b3e9c tests: add test showing change of phase while changing topic on secret commit
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3134
diff changeset
402 o 22:1b88140feefe {foobar}
5b24ed4b3e9c tests: add test showing change of phase while changing topic on secret commit
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3134
diff changeset
403 | Added c ()
5b24ed4b3e9c tests: add test showing change of phase while changing topic on secret commit
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3134
diff changeset
404 |
5b24ed4b3e9c tests: add test showing change of phase while changing topic on secret commit
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3134
diff changeset
405 o 21:c39cabfcbbf7 {foobar}
5b24ed4b3e9c tests: add test showing change of phase while changing topic on secret commit
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3134
diff changeset
406 | Added b ()
5b24ed4b3e9c tests: add test showing change of phase while changing topic on secret commit
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3134
diff changeset
407 |
5b24ed4b3e9c tests: add test showing change of phase while changing topic on secret commit
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3134
diff changeset
408 o 8:86a186070af2 {}
5b24ed4b3e9c tests: add test showing change of phase while changing topic on secret commit
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3134
diff changeset
409 Added a ()
5b24ed4b3e9c tests: add test showing change of phase while changing topic on secret commit
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3134
diff changeset
410
5b24ed4b3e9c tests: add test showing change of phase while changing topic on secret commit
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3134
diff changeset
411 $ hg phase -r .
3136
a05b6580f71c topics: handle phase correctly while changing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3135
diff changeset
412 33: secret