Mercurial > evolve
annotate tests/test-topic-change.t @ 5816:a1dad44fe3da
tests: remove some unnecessary config
Some of these tests were originally split from a single file that had (and
used) these options, and some of the tests were later created by just
mindlessly copypasting the same set of options that aren't applicable to the
newly written tests.
Things removed by this patch:
- web section from tests that don't use hg serve and don't push
- phases.publish from tests that don't exchange changesets between repos
- diff section from tests that don't have any diffs
- defaults section that sets the date
The defaults section that only adds -d '0 0' to commands should no longer be
necessary because run-tests.py sets devel.default-date='0 0' since 4.3, and all
command in evolve should respect this config option.
author | Anton Shestakov <av6@dwimlabs.net> |
---|---|
date | Wed, 03 Mar 2021 10:57:09 +0800 |
parents | c2fab88e6d60 |
children | 03410b04cf10 f8ab6ad1ffc0 |
rev | line source |
---|---|
3037
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 > # disable the new graph style until we drop 3.7 support |
5c8d5f980f49
tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
8 > graphstyle.missing = | |
5c8d5f980f49
tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
9 > evolution=createmarkers, allowunstable |
5c8d5f980f49
tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
10 > [phases] |
5c8d5f980f49
tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
11 > publish=false |
5c8d5f980f49
tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
12 > [alias] |
3384
2b06f144b6e0
topics: add a new templatekeyword `topic`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3359
diff
changeset
|
13 > glog = log -G -T "{rev}:{node|short} \{{topic}}\n{desc} ({bookmarks})\n\n" |
3037
5c8d5f980f49
tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
14 > EOF |
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 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
|
17 |
5c8d5f980f49
tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
18 Setting up a repo |
5c8d5f980f49
tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
19 ---------------- |
5c8d5f980f49
tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
20 |
5c8d5f980f49
tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
21 $ hg init topics |
5c8d5f980f49
tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
22 $ cd topics |
3041
e162597b375a
test: remove bashism in test-topic-change.t
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3040
diff
changeset
|
23 $ for ch in a b c d e f g h; do touch $ch; echo "foo" >> $ch; hg ci -Aqm "Added "$ch; done |
3037
5c8d5f980f49
tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
24 |
5c8d5f980f49
tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
25 $ hg glog |
5c8d5f980f49
tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
26 @ 7:ec2426147f0e {} |
5c8d5f980f49
tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
27 | Added h () |
5c8d5f980f49
tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
28 | |
5c8d5f980f49
tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
29 o 6:87d6d6676308 {} |
5c8d5f980f49
tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
30 | Added g () |
5c8d5f980f49
tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
31 | |
5c8d5f980f49
tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
32 o 5:825660c69f0c {} |
5c8d5f980f49
tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
33 | Added f () |
5c8d5f980f49
tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
34 | |
5c8d5f980f49
tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
35 o 4:aa98ab95a928 {} |
5c8d5f980f49
tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
36 | Added e () |
5c8d5f980f49
tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
37 | |
5c8d5f980f49
tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
38 o 3:62615734edd5 {} |
5c8d5f980f49
tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
39 | Added d () |
5c8d5f980f49
tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
40 | |
5c8d5f980f49
tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
41 o 2:28ad74487de9 {} |
5c8d5f980f49
tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
42 | Added c () |
5c8d5f980f49
tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
43 | |
5c8d5f980f49
tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
44 o 1:29becc82797a {} |
5c8d5f980f49
tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
45 | Added b () |
5c8d5f980f49
tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
46 | |
5c8d5f980f49
tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
47 o 0:18d04c59bb5d {} |
5c8d5f980f49
tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
48 Added a () |
5c8d5f980f49
tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
49 |
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 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
|
52 |
5c8d5f980f49
tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
53 $ hg topic -r . --clear |
4268
d5a2cc19903f
topics: improve the message around topic changing
Pulkit Goyal <pulkit@yandex-team.ru>
parents:
3769
diff
changeset
|
54 cleared topic on 0 changesets |
3037
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 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
|
57 |
5c8d5f980f49
tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
58 $ hg topic |
5c8d5f980f49
tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
59 $ hg topic --clear |
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 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
|
62 |
5c8d5f980f49
tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
63 $ 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
|
64 switching to topic foo |
4268
d5a2cc19903f
topics: improve the message around topic changing
Pulkit Goyal <pulkit@yandex-team.ru>
parents:
3769
diff
changeset
|
65 changed topic on 8 changesets to "foo" |
3037
5c8d5f980f49
tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
66 $ hg glog |
5c8d5f980f49
tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
67 @ 15:05095f607171 {foo} |
5c8d5f980f49
tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
68 | Added h () |
5c8d5f980f49
tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
69 | |
5c8d5f980f49
tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
70 o 14:97505b53ab0d {foo} |
5c8d5f980f49
tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
71 | Added g () |
5c8d5f980f49
tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
72 | |
5c8d5f980f49
tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
73 o 13:75a8360fe626 {foo} |
5c8d5f980f49
tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
74 | Added f () |
5c8d5f980f49
tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
75 | |
5c8d5f980f49
tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
76 o 12:abcedffeae90 {foo} |
5c8d5f980f49
tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
77 | Added e () |
5c8d5f980f49
tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
78 | |
5c8d5f980f49
tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
79 o 11:1315a3808ed0 {foo} |
5c8d5f980f49
tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
80 | Added d () |
5c8d5f980f49
tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
81 | |
5c8d5f980f49
tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
82 o 10:1fa891977a22 {foo} |
5c8d5f980f49
tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
83 | Added c () |
5c8d5f980f49
tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
84 | |
5c8d5f980f49
tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
85 o 9:a53ba98dd6b8 {foo} |
5c8d5f980f49
tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
86 | Added b () |
5c8d5f980f49
tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
87 | |
5c8d5f980f49
tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
88 o 8:86a186070af2 {foo} |
5c8d5f980f49
tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
89 Added a () |
5c8d5f980f49
tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
90 |
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 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
|
93 |
5c8d5f980f49
tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
94 $ hg topic |
3060
f43a310c4338
topics: show changesetcount, troubledcount and headscount by default
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3041
diff
changeset
|
95 * foo (8 changesets) |
3037
5c8d5f980f49
tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
96 $ hg topic --clear |
5c8d5f980f49
tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
97 $ hg topic |
3060
f43a310c4338
topics: show changesetcount, troubledcount and headscount by default
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3041
diff
changeset
|
98 foo (8 changesets) |
3037
5c8d5f980f49
tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
99 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
|
100 |
3580
031d70bcbb42
test: do not use revision number
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3431
diff
changeset
|
101 $ hg topic -r abcedffeae90:: bar |
3037
5c8d5f980f49
tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
102 switching to topic bar |
4268
d5a2cc19903f
topics: improve the message around topic changing
Pulkit Goyal <pulkit@yandex-team.ru>
parents:
3769
diff
changeset
|
103 changed topic on 4 changesets to "bar" |
3037
5c8d5f980f49
tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
104 $ hg glog |
5c8d5f980f49
tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
105 @ 19:d7d36e193ea7 {bar} |
5c8d5f980f49
tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
106 | Added h () |
5c8d5f980f49
tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
107 | |
5c8d5f980f49
tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
108 o 18:e7b418d79a05 {bar} |
5c8d5f980f49
tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
109 | Added g () |
5c8d5f980f49
tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
110 | |
5c8d5f980f49
tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
111 o 17:82e0b14f4d9e {bar} |
5c8d5f980f49
tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
112 | Added f () |
5c8d5f980f49
tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
113 | |
5c8d5f980f49
tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
114 o 16:edc4a6b9ea60 {bar} |
5c8d5f980f49
tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
115 | Added e () |
5c8d5f980f49
tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
116 | |
5c8d5f980f49
tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
117 o 11:1315a3808ed0 {foo} |
5c8d5f980f49
tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
118 | Added d () |
5c8d5f980f49
tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
119 | |
5c8d5f980f49
tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
120 o 10:1fa891977a22 {foo} |
5c8d5f980f49
tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
121 | Added c () |
5c8d5f980f49
tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
122 | |
5c8d5f980f49
tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
123 o 9:a53ba98dd6b8 {foo} |
5c8d5f980f49
tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
124 | Added b () |
5c8d5f980f49
tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
125 | |
5c8d5f980f49
tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
126 o 8:86a186070af2 {foo} |
5c8d5f980f49
tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
127 Added a () |
5c8d5f980f49
tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
128 |
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 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
|
131 |
5c8d5f980f49
tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
132 $ hg topic -r . |
5c8d5f980f49
tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
133 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
|
134 [255] |
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 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
|
137 |
5c8d5f980f49
tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
138 $ hg topic foobar |
5c8d5f980f49
tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
139 $ hg topic -r . --current |
5c8d5f980f49
tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
140 active topic 'foobar' grew its first changeset |
3769
1bc4b0807c37
topic: display a hint pointing at help when a topic becomes non-empty
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
3580
diff
changeset
|
141 (see 'hg help topics' for more information) |
4268
d5a2cc19903f
topics: improve the message around topic changing
Pulkit Goyal <pulkit@yandex-team.ru>
parents:
3769
diff
changeset
|
142 changed topic on 1 changesets to "foobar" |
3037
5c8d5f980f49
tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
143 $ hg glog -r . |
5c8d5f980f49
tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
144 @ 20:c2d6b7df5dcf {foobar} |
5c8d5f980f49
tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
145 | Added h () |
5c8d5f980f49
tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
146 | |
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 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
|
149 |
5c8d5f980f49
tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
150 $ hg topic -r 9::10 --current |
3431
2e703ed1c713
evolve: update output for wider reporting of troubled changesets
Martin von Zweigbergk <martinvonz@google.com>
parents:
3417
diff
changeset
|
151 5 new orphan changesets |
4268
d5a2cc19903f
topics: improve the message around topic changing
Pulkit Goyal <pulkit@yandex-team.ru>
parents:
3769
diff
changeset
|
152 changed topic on 2 changesets to "foobar" |
3037
5c8d5f980f49
tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
153 $ hg glog |
5c8d5f980f49
tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
154 o 22:1b88140feefe {foobar} |
5c8d5f980f49
tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
155 | Added c () |
5c8d5f980f49
tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
156 | |
5c8d5f980f49
tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
157 o 21:c39cabfcbbf7 {foobar} |
5c8d5f980f49
tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
158 | Added b () |
5c8d5f980f49
tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
159 | |
5c8d5f980f49
tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
160 | @ 20:c2d6b7df5dcf {foobar} |
5c8d5f980f49
tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
161 | | Added h () |
5c8d5f980f49
tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
162 | | |
3417
d3a17c67f85c
branching: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3411
diff
changeset
|
163 | * 18:e7b418d79a05 {bar} |
3037
5c8d5f980f49
tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
164 | | Added g () |
5c8d5f980f49
tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
165 | | |
3417
d3a17c67f85c
branching: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3411
diff
changeset
|
166 | * 17:82e0b14f4d9e {bar} |
3037
5c8d5f980f49
tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
167 | | Added f () |
5c8d5f980f49
tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
168 | | |
3417
d3a17c67f85c
branching: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3411
diff
changeset
|
169 | * 16:edc4a6b9ea60 {bar} |
3037
5c8d5f980f49
tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
170 | | Added e () |
5c8d5f980f49
tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
171 | | |
3417
d3a17c67f85c
branching: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3411
diff
changeset
|
172 | * 11:1315a3808ed0 {foo} |
3037
5c8d5f980f49
tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
173 | | Added d () |
5c8d5f980f49
tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
174 | | |
5c8d5f980f49
tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
175 | x 10:1fa891977a22 {foo} |
5c8d5f980f49
tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
176 | | Added c () |
5c8d5f980f49
tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
177 | | |
5c8d5f980f49
tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
178 | x 9:a53ba98dd6b8 {foo} |
5c8d5f980f49
tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
179 |/ Added b () |
5c8d5f980f49
tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
180 | |
5c8d5f980f49
tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
181 o 8:86a186070af2 {foo} |
5c8d5f980f49
tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
182 Added a () |
5c8d5f980f49
tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
183 |
5c8d5f980f49
tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
184 $ hg rebase -s 11 -d 22 |
5647
c2fab88e6d60
tests: rebase now produces different "one-line summary" output
Martin von Zweigbergk <martinvonz@google.com>
parents:
4268
diff
changeset
|
185 rebasing 11:1315a3808ed0 foo "Added d" |
3037
5c8d5f980f49
tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
186 switching to topic foo |
5647
c2fab88e6d60
tests: rebase now produces different "one-line summary" output
Martin von Zweigbergk <martinvonz@google.com>
parents:
4268
diff
changeset
|
187 rebasing 16:edc4a6b9ea60 bar "Added e" |
3037
5c8d5f980f49
tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
188 switching to topic bar |
5647
c2fab88e6d60
tests: rebase now produces different "one-line summary" output
Martin von Zweigbergk <martinvonz@google.com>
parents:
4268
diff
changeset
|
189 rebasing 17:82e0b14f4d9e bar "Added f" |
c2fab88e6d60
tests: rebase now produces different "one-line summary" output
Martin von Zweigbergk <martinvonz@google.com>
parents:
4268
diff
changeset
|
190 rebasing 18:e7b418d79a05 bar "Added g" |
c2fab88e6d60
tests: rebase now produces different "one-line summary" output
Martin von Zweigbergk <martinvonz@google.com>
parents:
4268
diff
changeset
|
191 rebasing 20:c2d6b7df5dcf foobar "Added h" |
3037
5c8d5f980f49
tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
192 switching to topic foobar |
5c8d5f980f49
tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
193 |
5c8d5f980f49
tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
194 $ hg glog |
5c8d5f980f49
tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
195 @ 27:a1a9465da59b {foobar} |
5c8d5f980f49
tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
196 | Added h () |
5c8d5f980f49
tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
197 | |
5c8d5f980f49
tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
198 o 26:7c76c271395f {bar} |
5c8d5f980f49
tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
199 | Added g () |
5c8d5f980f49
tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
200 | |
5c8d5f980f49
tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
201 o 25:7f26084dfaf1 {bar} |
5c8d5f980f49
tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
202 | Added f () |
5c8d5f980f49
tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
203 | |
5c8d5f980f49
tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
204 o 24:b1f05e9ba0b5 {bar} |
5c8d5f980f49
tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
205 | Added e () |
5c8d5f980f49
tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
206 | |
5c8d5f980f49
tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
207 o 23:f9869da2286e {foo} |
5c8d5f980f49
tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
208 | Added d () |
5c8d5f980f49
tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
209 | |
5c8d5f980f49
tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
210 o 22:1b88140feefe {foobar} |
5c8d5f980f49
tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
211 | Added c () |
5c8d5f980f49
tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
212 | |
5c8d5f980f49
tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
213 o 21:c39cabfcbbf7 {foobar} |
5c8d5f980f49
tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
214 | Added b () |
5c8d5f980f49
tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
215 | |
5c8d5f980f49
tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
216 o 8:86a186070af2 {foo} |
5c8d5f980f49
tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
217 Added a () |
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 Amending a topic |
5c8d5f980f49
tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
220 ---------------- |
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 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
|
223 |
5c8d5f980f49
tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
224 $ hg topic wat |
5c8d5f980f49
tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
225 $ hg ci --amend |
5c8d5f980f49
tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
226 active topic 'wat' grew its first changeset |
3769
1bc4b0807c37
topic: display a hint pointing at help when a topic becomes non-empty
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
3580
diff
changeset
|
227 (see 'hg help topics' for more information) |
3037
5c8d5f980f49
tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
228 $ hg glog -r . |
5c8d5f980f49
tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
229 @ 28:61470c956807 {wat} |
5c8d5f980f49
tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
230 | Added h () |
5c8d5f980f49
tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
231 | |
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 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
|
234 |
5c8d5f980f49
tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
235 $ hg topic --clear |
5c8d5f980f49
tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
236 $ hg ci --amend |
5c8d5f980f49
tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
237 $ hg glog -r . |
5c8d5f980f49
tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
238 @ 29:b584fa49f42e {} |
5c8d5f980f49
tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
239 | Added h () |
5c8d5f980f49
tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
240 | |
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 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
|
243 |
5c8d5f980f49
tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
244 $ hg topic watwat |
5c8d5f980f49
tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
245 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
|
246 $ hg ci --amend |
5c8d5f980f49
tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
247 active topic 'watwat' grew its first changeset |
3769
1bc4b0807c37
topic: display a hint pointing at help when a topic becomes non-empty
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
3580
diff
changeset
|
248 (see 'hg help topics' for more information) |
3037
5c8d5f980f49
tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
249 $ hg glog -r . |
5c8d5f980f49
tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
250 @ 30:a24c31c35013 {watwat} |
5c8d5f980f49
tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
251 | Added h () |
5c8d5f980f49
tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
252 | |
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 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
|
255 ------------------------------------------- |
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 $ 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
|
258 |
5c8d5f980f49
tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
259 Clearing the topic |
5c8d5f980f49
tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
260 |
5c8d5f980f49
tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
261 $ 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
|
262 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
|
263 [255] |
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 Changing the topic |
5c8d5f980f49
tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
266 |
5c8d5f980f49
tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
267 $ 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
|
268 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
|
269 [255] |
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 Testing the bookmark movement |
5c8d5f980f49
tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
272 ----------------------------- |
5c8d5f980f49
tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
273 |
5c8d5f980f49
tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
274 $ hg bookmark book |
5c8d5f980f49
tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
275 $ hg glog |
5c8d5f980f49
tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
276 @ 30:a24c31c35013 {watwat} |
5c8d5f980f49
tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
277 | Added h (book) |
5c8d5f980f49
tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
278 | |
5c8d5f980f49
tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
279 o 26:7c76c271395f {bar} |
5c8d5f980f49
tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
280 | Added g () |
5c8d5f980f49
tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
281 | |
5c8d5f980f49
tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
282 o 25:7f26084dfaf1 {bar} |
5c8d5f980f49
tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
283 | Added f () |
5c8d5f980f49
tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
284 | |
5c8d5f980f49
tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
285 o 24:b1f05e9ba0b5 {bar} |
5c8d5f980f49
tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
286 | Added e () |
5c8d5f980f49
tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
287 | |
5c8d5f980f49
tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
288 o 23:f9869da2286e {foo} |
5c8d5f980f49
tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
289 | Added d () |
5c8d5f980f49
tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
290 | |
5c8d5f980f49
tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
291 o 22:1b88140feefe {foobar} |
5c8d5f980f49
tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
292 | Added c () |
5c8d5f980f49
tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
293 | |
5c8d5f980f49
tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
294 o 21:c39cabfcbbf7 {foobar} |
5c8d5f980f49
tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
295 | Added b () |
5c8d5f980f49
tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
296 | |
5c8d5f980f49
tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
297 o 8:86a186070af2 {} |
5c8d5f980f49
tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
298 Added a () |
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 On clearing the topic |
5c8d5f980f49
tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
301 |
5c8d5f980f49
tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
302 $ hg topic -r . --clear |
5c8d5f980f49
tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
303 clearing empty topic "watwat" |
5c8d5f980f49
tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
304 active topic 'watwat' is now empty |
4268
d5a2cc19903f
topics: improve the message around topic changing
Pulkit Goyal <pulkit@yandex-team.ru>
parents:
3769
diff
changeset
|
305 cleared topic on 1 changesets |
3037
5c8d5f980f49
tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
306 |
5c8d5f980f49
tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
307 $ hg glog |
5c8d5f980f49
tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
308 @ 31:c48d6d71b2d9 {} |
3038
103244e34a9c
topics: use scmutil.cleanupnodes to create markers while changing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3037
diff
changeset
|
309 | Added h (book) |
3037
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 |
4268
d5a2cc19903f
topics: improve the message around topic changing
Pulkit Goyal <pulkit@yandex-team.ru>
parents:
3769
diff
changeset
|
338 changed topic on 1 changesets to "movebook" |
3037
5c8d5f980f49
tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
339 $ hg glog |
5c8d5f980f49
tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
340 @ 32:1b83d11095b9 {movebook} |
3038
103244e34a9c
topics: use scmutil.cleanupnodes to create markers while changing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3037
diff
changeset
|
341 | Added h (book bookboo) |
3037
5c8d5f980f49
tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
342 | |
5c8d5f980f49
tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
343 o 26:7c76c271395f {bar} |
5c8d5f980f49
tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
344 | Added g () |
5c8d5f980f49
tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
345 | |
5c8d5f980f49
tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
346 o 25:7f26084dfaf1 {bar} |
5c8d5f980f49
tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
347 | Added f () |
5c8d5f980f49
tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
348 | |
5c8d5f980f49
tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
349 o 24:b1f05e9ba0b5 {bar} |
5c8d5f980f49
tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
350 | Added e () |
5c8d5f980f49
tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
351 | |
5c8d5f980f49
tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
352 o 23:f9869da2286e {foo} |
5c8d5f980f49
tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
353 | Added d () |
5c8d5f980f49
tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
354 | |
5c8d5f980f49
tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
355 o 22:1b88140feefe {foobar} |
5c8d5f980f49
tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
356 | Added c () |
5c8d5f980f49
tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
357 | |
5c8d5f980f49
tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
358 o 21:c39cabfcbbf7 {foobar} |
5c8d5f980f49
tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
359 | Added b () |
5c8d5f980f49
tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
360 | |
5c8d5f980f49
tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
361 o 8:86a186070af2 {} |
5c8d5f980f49
tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
362 Added a () |
5c8d5f980f49
tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
363 |
3039
5b24ed4b3e9c
tests: add test showing change of phase while changing topic on secret commit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3038
diff
changeset
|
364 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:
3038
diff
changeset
|
365 ----------------------------------- |
5b24ed4b3e9c
tests: add test showing change of phase while changing topic on secret commit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3038
diff
changeset
|
366 |
5b24ed4b3e9c
tests: add test showing change of phase while changing topic on secret commit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3038
diff
changeset
|
367 $ hg up 26 |
5b24ed4b3e9c
tests: add test showing change of phase while changing topic on secret commit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3038
diff
changeset
|
368 switching to topic bar |
5b24ed4b3e9c
tests: add test showing change of phase while changing topic on secret commit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3038
diff
changeset
|
369 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:
3038
diff
changeset
|
370 (leaving bookmark bookboo) |
5b24ed4b3e9c
tests: add test showing change of phase while changing topic on secret commit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3038
diff
changeset
|
371 |
5b24ed4b3e9c
tests: add test showing change of phase while changing topic on secret commit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3038
diff
changeset
|
372 $ 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:
3038
diff
changeset
|
373 $ hg phase -r . |
5b24ed4b3e9c
tests: add test showing change of phase while changing topic on secret commit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3038
diff
changeset
|
374 26: secret |
5b24ed4b3e9c
tests: add test showing change of phase while changing topic on secret commit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3038
diff
changeset
|
375 |
5b24ed4b3e9c
tests: add test showing change of phase while changing topic on secret commit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3038
diff
changeset
|
376 $ hg topic -r . watwat |
5b24ed4b3e9c
tests: add test showing change of phase while changing topic on secret commit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3038
diff
changeset
|
377 switching to topic watwat |
3431
2e703ed1c713
evolve: update output for wider reporting of troubled changesets
Martin von Zweigbergk <martinvonz@google.com>
parents:
3417
diff
changeset
|
378 1 new orphan changesets |
4268
d5a2cc19903f
topics: improve the message around topic changing
Pulkit Goyal <pulkit@yandex-team.ru>
parents:
3769
diff
changeset
|
379 changed topic on 1 changesets to "watwat" |
3039
5b24ed4b3e9c
tests: add test showing change of phase while changing topic on secret commit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3038
diff
changeset
|
380 |
5b24ed4b3e9c
tests: add test showing change of phase while changing topic on secret commit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3038
diff
changeset
|
381 $ hg glog |
5b24ed4b3e9c
tests: add test showing change of phase while changing topic on secret commit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3038
diff
changeset
|
382 @ 33:894983f69e69 {watwat} |
5b24ed4b3e9c
tests: add test showing change of phase while changing topic on secret commit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3038
diff
changeset
|
383 | Added g () |
5b24ed4b3e9c
tests: add test showing change of phase while changing topic on secret commit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3038
diff
changeset
|
384 | |
3417
d3a17c67f85c
branching: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3411
diff
changeset
|
385 | * 32:1b83d11095b9 {movebook} |
3039
5b24ed4b3e9c
tests: add test showing change of phase while changing topic on secret commit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3038
diff
changeset
|
386 | | Added h (book bookboo) |
5b24ed4b3e9c
tests: add test showing change of phase while changing topic on secret commit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3038
diff
changeset
|
387 | | |
5b24ed4b3e9c
tests: add test showing change of phase while changing topic on secret commit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3038
diff
changeset
|
388 | x 26:7c76c271395f {bar} |
5b24ed4b3e9c
tests: add test showing change of phase while changing topic on secret commit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3038
diff
changeset
|
389 |/ Added g () |
5b24ed4b3e9c
tests: add test showing change of phase while changing topic on secret commit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3038
diff
changeset
|
390 | |
5b24ed4b3e9c
tests: add test showing change of phase while changing topic on secret commit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3038
diff
changeset
|
391 o 25:7f26084dfaf1 {bar} |
5b24ed4b3e9c
tests: add test showing change of phase while changing topic on secret commit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3038
diff
changeset
|
392 | Added f () |
5b24ed4b3e9c
tests: add test showing change of phase while changing topic on secret commit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3038
diff
changeset
|
393 | |
5b24ed4b3e9c
tests: add test showing change of phase while changing topic on secret commit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3038
diff
changeset
|
394 o 24:b1f05e9ba0b5 {bar} |
5b24ed4b3e9c
tests: add test showing change of phase while changing topic on secret commit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3038
diff
changeset
|
395 | Added e () |
5b24ed4b3e9c
tests: add test showing change of phase while changing topic on secret commit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3038
diff
changeset
|
396 | |
5b24ed4b3e9c
tests: add test showing change of phase while changing topic on secret commit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3038
diff
changeset
|
397 o 23:f9869da2286e {foo} |
5b24ed4b3e9c
tests: add test showing change of phase while changing topic on secret commit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3038
diff
changeset
|
398 | Added d () |
5b24ed4b3e9c
tests: add test showing change of phase while changing topic on secret commit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3038
diff
changeset
|
399 | |
5b24ed4b3e9c
tests: add test showing change of phase while changing topic on secret commit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3038
diff
changeset
|
400 o 22:1b88140feefe {foobar} |
5b24ed4b3e9c
tests: add test showing change of phase while changing topic on secret commit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3038
diff
changeset
|
401 | Added c () |
5b24ed4b3e9c
tests: add test showing change of phase while changing topic on secret commit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3038
diff
changeset
|
402 | |
5b24ed4b3e9c
tests: add test showing change of phase while changing topic on secret commit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3038
diff
changeset
|
403 o 21:c39cabfcbbf7 {foobar} |
5b24ed4b3e9c
tests: add test showing change of phase while changing topic on secret commit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3038
diff
changeset
|
404 | Added b () |
5b24ed4b3e9c
tests: add test showing change of phase while changing topic on secret commit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3038
diff
changeset
|
405 | |
5b24ed4b3e9c
tests: add test showing change of phase while changing topic on secret commit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3038
diff
changeset
|
406 o 8:86a186070af2 {} |
5b24ed4b3e9c
tests: add test showing change of phase while changing topic on secret commit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3038
diff
changeset
|
407 Added a () |
5b24ed4b3e9c
tests: add test showing change of phase while changing topic on secret commit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3038
diff
changeset
|
408 |
5b24ed4b3e9c
tests: add test showing change of phase while changing topic on secret commit
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3038
diff
changeset
|
409 $ hg phase -r . |
3040
a05b6580f71c
topics: handle phase correctly while changing topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3039
diff
changeset
|
410 33: secret |