227 s3: c_e |
227 s3: c_e |
228 s2: c_d |
228 s2: c_d |
229 s1: c_c |
229 s1: c_c |
230 s0^ c_b (base) |
230 s0^ c_b (base) |
231 |
231 |
|
232 merge case (displaying info about external) |
|
233 ------------------------------------------- |
|
234 |
|
235 $ hg up default |
|
236 0 files updated, 0 files merged, 4 files removed, 0 files unresolved |
|
237 $ hg topics zzz |
|
238 marked working directory as topic: zzz |
|
239 $ echo zzz > zzz |
|
240 $ hg add zzz |
|
241 $ hg commit -m zzz_a |
|
242 active topic 'zzz' grew its first changeset |
|
243 (see 'hg help topics' for more information) |
|
244 $ hg merge foo |
|
245 4 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
246 (branch merge, don't forget to commit) |
|
247 $ hg commit -m "merged foo" |
|
248 |
|
249 stack -m display data about child |
|
250 |
|
251 $ hg stack foo |
|
252 ### topic: foo |
|
253 ### target: default (branch) |
|
254 s4: c_f |
|
255 s3: c_e |
|
256 s2: c_d |
|
257 s1: c_c |
|
258 s0^ c_b (base) |
|
259 |
|
260 $ hg stack foo --children |
|
261 ### topic: foo |
|
262 ### target: default (branch) |
|
263 s4: c_f (external-children) |
|
264 s3: c_e |
|
265 s2: c_d |
|
266 s1: c_c |
|
267 s0^ c_b (base) |
|
268 |
232 error case, nothing to list |
269 error case, nothing to list |
|
270 |
|
271 $ hg strip --config extensions.strip= t1 --no-backup |
|
272 0 files updated, 0 files merged, 5 files removed, 0 files unresolved |
|
273 |
|
274 $ hg up foo |
|
275 switching to topic foo |
|
276 4 files updated, 0 files merged, 0 files removed, 0 files unresolved |
233 |
277 |
234 $ hg topic --clear |
278 $ hg topic --clear |
235 $ hg stack |
279 $ hg stack |
236 ### target: default (branch) |
280 ### target: default (branch) |
237 (stack is empty) |
281 (stack is empty) |
493 |
537 |
494 Changing topics on some commits in between |
538 Changing topics on some commits in between |
495 $ hg topic foobar -r 'desc(c_e) + desc(c_D)' |
539 $ hg topic foobar -r 'desc(c_e) + desc(c_D)' |
496 switching to topic foobar |
540 switching to topic foobar |
497 4 new orphan changesets |
541 4 new orphan changesets |
498 changed topic on 2 changes |
542 changed topic on 2 changesets to "foobar" |
499 $ hg log -G |
543 $ hg log -G |
500 @ 17 default {foobar} draft c_D |
544 @ 17 default {foobar} draft c_D |
501 | |
545 | |
502 | * 16 default {foobar} draft c_e |
546 | * 16 default {foobar} draft c_e |
503 | | |
547 | | |
865 |
909 |
866 diff --git a/ggg b/ggg |
910 diff --git a/ggg b/ggg |
867 new file mode 100644 |
911 new file mode 100644 |
868 examine changes to 'ggg'? [Ynesfdaq?] n |
912 examine changes to 'ggg'? [Ynesfdaq?] n |
869 |
913 |
870 Done splitting? [yN] y |
914 continue splitting? [Ycdq?] c |
871 |
915 |
872 $ hg --config extensions.evolve= obslog --all |
916 $ hg --config extensions.evolve= obslog --all |
873 o dde94df880e9 (21) c_G |
917 o dde94df880e9 (21) c_G |
874 | |
918 | |
875 | @ e7ea874afbd5 (22) c_G |
919 | @ e7ea874afbd5 (22) c_G |