equal
deleted
inserted
replaced
55 |
55 |
56 $ hg phase --public -r 1 |
56 $ hg phase --public -r 1 |
57 $ hg show work |
57 $ hg show work |
58 @ 128c commit 2 |
58 @ 128c commit 2 |
59 o 181c commit 1 |
59 o 181c commit 1 |
60 | |
|
61 ~ |
60 ~ |
62 |
61 |
63 Multiple DAG heads will be shown |
62 Multiple DAG heads will be shown |
64 |
63 |
65 $ hg -q up -r 1 |
64 $ hg -q up -r 1 |
70 $ hg show work |
69 $ hg show work |
71 @ f0ab commit 3 |
70 @ f0ab commit 3 |
72 | o 128c commit 2 |
71 | o 128c commit 2 |
73 |/ |
72 |/ |
74 o 181c commit 1 |
73 o 181c commit 1 |
75 | |
|
76 ~ |
74 ~ |
77 |
75 |
78 Even when wdir is something else |
76 Even when wdir is something else |
79 |
77 |
80 $ hg -q up null |
78 $ hg -q up null |
82 $ hg show work |
80 $ hg show work |
83 o f0ab commit 3 |
81 o f0ab commit 3 |
84 | o 128c commit 2 |
82 | o 128c commit 2 |
85 |/ |
83 |/ |
86 o 181c commit 1 |
84 o 181c commit 1 |
87 | |
|
88 ~ |
85 ~ |
89 |
86 |
90 Draft child shows public head (multiple heads) |
87 Draft child shows public head (multiple heads) |
91 |
88 |
92 $ hg -q up 0 |
89 $ hg -q up 0 |
129 @ f8dd (mybranch) commit 4 |
126 @ f8dd (mybranch) commit 4 |
130 o 90cf (mybranch) commit 3 |
127 o 90cf (mybranch) commit 3 |
131 | o 128c commit 2 |
128 | o 128c commit 2 |
132 |/ |
129 |/ |
133 o 181c commit 1 |
130 o 181c commit 1 |
134 | |
|
135 ~ |
131 ~ |
136 |
132 |
137 $ cd .. |
133 $ cd .. |
138 |
134 |
139 Bookmark name appears in output |
135 Bookmark name appears in output |
160 @ cac8 (mybook) commit 4 |
156 @ cac8 (mybook) commit 4 |
161 o f0ab commit 3 |
157 o f0ab commit 3 |
162 | o 128c (@) commit 2 |
158 | o 128c (@) commit 2 |
163 |/ |
159 |/ |
164 o 181c commit 1 |
160 o 181c commit 1 |
165 | |
|
166 ~ |
161 ~ |
167 |
162 |
168 $ cd .. |
163 $ cd .. |
169 |
164 |
170 Tags are rendered |
165 Tags are rendered |
183 |
178 |
184 $ hg show work |
179 $ hg show work |
185 @ 3758 Added tag 0.2 for changeset 6379c25b76f1 |
180 @ 3758 Added tag 0.2 for changeset 6379c25b76f1 |
186 o 6379 (0.2) commit 3 |
181 o 6379 (0.2) commit 3 |
187 o a2ad Added tag 0.1 for changeset 6a75536ea0b1 |
182 o a2ad Added tag 0.1 for changeset 6a75536ea0b1 |
188 | |
|
189 ~ |
183 ~ |
190 |
184 |
191 $ cd .. |
185 $ cd .. |
192 |
186 |
193 Multiple names on same changeset render properly |
187 Multiple names on same changeset render properly |
244 obsoleted 1 changesets |
238 obsoleted 1 changesets |
245 1 new orphan changesets |
239 1 new orphan changesets |
246 $ hg show work --color=debug |
240 $ hg show work --color=debug |
247 @ [log.changeset changeset.draft changeset.unstable instability.orphan|32f3] [log.description|commit 3] |
241 @ [log.changeset changeset.draft changeset.unstable instability.orphan|32f3] [log.description|commit 3] |
248 x [log.changeset changeset.draft changeset.obsolete|6a75] [log.description|commit 2] |
242 x [log.changeset changeset.draft changeset.obsolete|6a75] [log.description|commit 2] |
249 | |
|
250 ~ |
243 ~ |
251 |
244 |
252 $ cd .. |
245 $ cd .. |
253 |
246 |
254 Prefix collision on hashes increases shortest node length |
247 Prefix collision on hashes increases shortest node length |