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