equal
deleted
inserted
replaced
634 $ hg up fran |
634 $ hg up fran |
635 switching to topic fran |
635 switching to topic fran |
636 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
636 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
637 $ hg stack |
637 $ hg stack |
638 ### topic: fran |
638 ### topic: fran |
639 ### target: default (branch), ambigious rebase destination - branch 'default' has 2 heads |
639 ### target: default (branch), ambiguous rebase destination - branch 'default' has 2 heads |
640 t1@ start on fran (current) |
640 t1@ start on fran (current) |
641 t0^ Add file delta (base) |
641 t0^ Add file delta (base) |
642 |
642 |
643 $ hg up t0 |
643 $ hg up t0 |
644 preserving the current topic 'fran' |
644 preserving the current topic 'fran' |
646 |
646 |
647 $ hg topic |
647 $ hg topic |
648 * fran (1 changesets) |
648 * fran (1 changesets) |
649 $ hg stack |
649 $ hg stack |
650 ### topic: fran |
650 ### topic: fran |
651 ### target: default (branch), ambigious rebase destination - branch 'default' has 2 heads |
651 ### target: default (branch), ambiguous rebase destination - branch 'default' has 2 heads |
652 t1: start on fran |
652 t1: start on fran |
653 t0^ Add file delta (base current) |
653 t0^ Add file delta (base current) |
654 |
654 |
655 $ hg topics --age |
655 $ hg topics --age |
656 * fran (1970-01-01 by test) |
656 * fran (1970-01-01 by test) |