396 marked working directory as branch new-branch |
396 marked working directory as branch new-branch |
397 (branches are permanent and global, did you want a bookmark?) |
397 (branches are permanent and global, did you want a bookmark?) |
398 $ hg commit -m "empty" |
398 $ hg commit -m "empty" |
399 $ hg split |
399 $ hg split |
400 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
400 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
401 |
|
402 Check that split keeps the right topic |
|
403 |
|
404 $ hg up -r tip |
|
405 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
406 |
|
407 Add topic to the hgrc |
|
408 |
|
409 $ echo "[extensions]" >> $HGRCPATH |
|
410 $ echo "topic=$(echo $(dirname $TESTDIR))/hgext3rd/topic/" >> $HGRCPATH |
|
411 $ hg topic mytopic |
|
412 marked working directory as topic: mytopic |
|
413 $ echo babar > babar |
|
414 $ echo celeste > celeste |
|
415 $ hg add babar celeste |
|
416 $ hg commit -m "Works on mytopic" babar celeste --user victor |
|
417 active topic 'mytopic' grew its first changeset |
|
418 $ hg log -r . |
|
419 changeset: 21:26f72cfaf036 |
|
420 branch: new-branch |
|
421 tag: tip |
|
422 topic: mytopic |
|
423 user: victor |
|
424 date: Thu Jan 01 00:00:00 1970 +0000 |
|
425 summary: Works on mytopic |
|
426 |
|
427 $ hg summary |
|
428 parent: 21:26f72cfaf036 tip |
|
429 Works on mytopic |
|
430 branch: new-branch |
|
431 commit: 2 unknown (clean) |
|
432 update: (current) |
|
433 phases: 9 draft |
|
434 topic: mytopic |
|
435 |
|
436 Split it |
|
437 |
|
438 $ hg split -U << EOF |
|
439 > Y |
|
440 > Y |
|
441 > N |
|
442 > Y |
|
443 > Y |
|
444 > Y |
|
445 > EOF |
|
446 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
|
447 adding babar |
|
448 adding celeste |
|
449 diff --git a/babar b/babar |
|
450 new file mode 100644 |
|
451 examine changes to 'babar'? [Ynesfdaq?] Y |
|
452 |
|
453 @@ -0,0 +1,1 @@ |
|
454 +babar |
|
455 record change 1/2 to 'babar'? [Ynesfdaq?] Y |
|
456 |
|
457 diff --git a/celeste b/celeste |
|
458 new file mode 100644 |
|
459 examine changes to 'celeste'? [Ynesfdaq?] N |
|
460 |
|
461 Done splitting? [yN] Y |
|
462 diff --git a/celeste b/celeste |
|
463 new file mode 100644 |
|
464 examine changes to 'celeste'? [Ynesfdaq?] Y |
|
465 |
|
466 @@ -0,0 +1,1 @@ |
|
467 +celeste |
|
468 record this change to 'celeste'? [Ynesfdaq?] Y |
|
469 |
|
470 no more change to split |
|
471 |
|
472 Check that the topic is still here |
|
473 |
|
474 $ hg log -r "tip~1::" |
|
475 changeset: 22:addcf498f19e |
|
476 branch: new-branch |
|
477 topic: mytopic |
|
478 parent: 20:fdb403258632 |
|
479 user: test |
|
480 date: Thu Jan 01 00:00:00 1970 +0000 |
|
481 summary: split7 |
|
482 |
|
483 changeset: 23:2532b288af61 |
|
484 branch: new-branch |
|
485 tag: tip |
|
486 topic: mytopic |
|
487 user: test |
|
488 date: Thu Jan 01 00:00:00 1970 +0000 |
|
489 summary: split8 |
|
490 |
|
491 $ hg topic |
|
492 * mytopic (2 changesets) |
|