equal
deleted
inserted
replaced
460 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
460 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
461 $ echo a1 > j/foo |
461 $ echo a1 > j/foo |
462 $ hg -R j ci -m a1 |
462 $ hg -R j ci -m a1 |
463 $ hg -R k branch b |
463 $ hg -R k branch b |
464 marked working directory as branch b |
464 marked working directory as branch b |
465 (branches are permanent and global, did you want a bookmark?) |
|
466 $ echo b > k/foo |
465 $ echo b > k/foo |
467 $ hg -R k ci -m b |
466 $ hg -R k ci -m b |
468 $ hg -R k up 0 |
467 $ hg -R k up 0 |
469 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
468 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
470 |
469 |
530 $ echo a >a |
529 $ echo a >a |
531 $ hg ci -Ama |
530 $ hg ci -Ama |
532 adding a |
531 adding a |
533 $ hg branch B |
532 $ hg branch B |
534 marked working directory as branch B |
533 marked working directory as branch B |
535 (branches are permanent and global, did you want a bookmark?) |
|
536 $ echo b >b |
534 $ echo b >b |
537 $ hg ci -Amb |
535 $ hg ci -Amb |
538 adding b |
536 adding b |
539 |
537 |
540 b is now branch head of B, and a topological head |
538 b is now branch head of B, and a topological head |
609 $ echo a >a |
607 $ echo a >a |
610 $ hg ci -Ama |
608 $ hg ci -Ama |
611 adding a |
609 adding a |
612 $ hg branch B |
610 $ hg branch B |
613 marked working directory as branch B |
611 marked working directory as branch B |
614 (branches are permanent and global, did you want a bookmark?) |
|
615 $ echo b >b |
612 $ echo b >b |
616 $ hg ci -Amb |
613 $ hg ci -Amb |
617 adding b |
614 adding b |
618 |
615 |
619 b is now branch head of B, and a topological head |
616 b is now branch head of B, and a topological head |
701 $ hg ci -ma1 |
698 $ hg ci -ma1 |
702 $ hg up null |
699 $ hg up null |
703 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
700 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
704 $ hg branch B |
701 $ hg branch B |
705 marked working directory as branch B |
702 marked working directory as branch B |
706 (branches are permanent and global, did you want a bookmark?) |
|
707 $ echo b0 >b |
703 $ echo b0 >b |
708 $ hg ci -Amb0 |
704 $ hg ci -Amb0 |
709 adding b |
705 adding b |
710 $ echo b1 >b |
706 $ echo b1 >b |
711 $ hg ci -mb1 |
707 $ hg ci -mb1 |
716 |
712 |
717 $ hg up A |
713 $ hg up A |
718 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
714 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
719 $ hg branch -f B |
715 $ hg branch -f B |
720 marked working directory as branch B |
716 marked working directory as branch B |
721 (branches are permanent and global, did you want a bookmark?) |
|
722 $ echo a3 >a |
717 $ echo a3 >a |
723 $ hg ci -ma3 |
718 $ hg ci -ma3 |
724 created new head |
719 created new head |
725 $ hg up 3 |
720 $ hg up 3 |
726 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
721 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
727 $ hg branch -f A |
722 $ hg branch -f A |
728 marked working directory as branch A |
723 marked working directory as branch A |
729 (branches are permanent and global, did you want a bookmark?) |
|
730 $ echo b3 >b |
724 $ echo b3 >b |
731 $ hg ci -mb3 |
725 $ hg ci -mb3 |
732 created new head |
726 created new head |
733 |
727 |
734 glog of local: |
728 glog of local: |