equal
deleted
inserted
replaced
548 requesting all changes |
548 requesting all changes |
549 adding changesets |
549 adding changesets |
550 adding manifests |
550 adding manifests |
551 adding file changes |
551 adding file changes |
552 added 3 changesets with 3 changes to 3 files (+1 heads) |
552 added 3 changesets with 3 changes to 3 files (+1 heads) |
|
553 new changesets f7b1eb17ad24:db815d6d32e6 |
553 updating to bookmark @ |
554 updating to bookmark @ |
554 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
555 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
555 $ hg -R cloned-bookmarks-pull bookmarks |
556 $ hg -R cloned-bookmarks-pull bookmarks |
556 * @ 2:db815d6d32e6 |
557 * @ 2:db815d6d32e6 |
557 X2 1:925d80f479bb |
558 X2 1:925d80f479bb |
585 $ hg clone -r 925d80 . cloned-bookmarks-rev |
586 $ hg clone -r 925d80 . cloned-bookmarks-rev |
586 adding changesets |
587 adding changesets |
587 adding manifests |
588 adding manifests |
588 adding file changes |
589 adding file changes |
589 added 2 changesets with 2 changes to 2 files |
590 added 2 changesets with 2 changes to 2 files |
|
591 new changesets f7b1eb17ad24:925d80f479bb |
590 updating to branch default |
592 updating to branch default |
591 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
593 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
592 $ hg -R cloned-bookmarks-rev bookmarks |
594 $ hg -R cloned-bookmarks-rev bookmarks |
593 X2 1:925d80f479bb |
595 X2 1:925d80f479bb |
594 |
596 |
625 $ hg unbundle tobundle.hg |
627 $ hg unbundle tobundle.hg |
626 adding changesets |
628 adding changesets |
627 adding manifests |
629 adding manifests |
628 adding file changes |
630 adding file changes |
629 added 2 changesets with 2 changes to 2 files (+1 heads) |
631 added 2 changesets with 2 changes to 2 files (+1 heads) |
|
632 new changesets 125c9a1d6df6:9ba5f110a0b3 |
630 (run 'hg heads' to see heads, 'hg merge' to merge) |
633 (run 'hg heads' to see heads, 'hg merge' to merge) |
631 |
634 |
632 update to active bookmark if it's not the parent |
635 update to active bookmark if it's not the parent |
633 |
636 |
634 (it is known issue that fsmonitor can't handle nested repositories. In |
637 (it is known issue that fsmonitor can't handle nested repositories. In |
672 adding manifests |
675 adding manifests |
673 adding file changes |
676 adding file changes |
674 added 2 changesets with 2 changes to 2 files (+1 heads) |
677 added 2 changesets with 2 changes to 2 files (+1 heads) |
675 updating bookmark Y |
678 updating bookmark Y |
676 updating bookmark Z |
679 updating bookmark Z |
|
680 new changesets 125c9a1d6df6:9ba5f110a0b3 |
677 (run 'hg heads' to see heads, 'hg merge' to merge) |
681 (run 'hg heads' to see heads, 'hg merge' to merge) |
678 |
682 |
679 (# tests strange but with --date crashing when bookmark have to move) |
683 (# tests strange but with --date crashing when bookmark have to move) |
680 |
684 |
681 $ hg -R ../cloned-bookmarks-manual-update update -d 1986 |
685 $ hg -R ../cloned-bookmarks-manual-update update -d 1986 |
697 adding manifests |
701 adding manifests |
698 adding file changes |
702 adding file changes |
699 added 2 changesets with 2 changes to 2 files (+1 heads) |
703 added 2 changesets with 2 changes to 2 files (+1 heads) |
700 updating bookmark Y |
704 updating bookmark Y |
701 updating bookmark Z |
705 updating bookmark Z |
|
706 new changesets 125c9a1d6df6:9ba5f110a0b3 |
702 updating to active bookmark Y |
707 updating to active bookmark Y |
703 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
708 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
704 |
709 |
705 We warn about divergent during bare update to the active bookmark |
710 We warn about divergent during bare update to the active bookmark |
706 |
711 |
721 adding manifests |
726 adding manifests |
722 adding file changes |
727 adding file changes |
723 added 2 changesets with 2 changes to 2 files (+1 heads) |
728 added 2 changesets with 2 changes to 2 files (+1 heads) |
724 updating bookmark Y |
729 updating bookmark Y |
725 updating bookmark Z |
730 updating bookmark Z |
|
731 new changesets 125c9a1d6df6:9ba5f110a0b3 |
726 (run 'hg heads' to see heads, 'hg merge' to merge) |
732 (run 'hg heads' to see heads, 'hg merge' to merge) |
727 $ hg -R ../cloned-bookmarks-manual-update-with-divergence update |
733 $ hg -R ../cloned-bookmarks-manual-update-with-divergence update |
728 updating to active bookmark Y |
734 updating to active bookmark Y |
729 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
735 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
730 1 other divergent bookmarks for "Y" |
736 1 other divergent bookmarks for "Y" |
905 added 1 changesets with 1 changes to 1 files |
911 added 1 changesets with 1 changes to 1 files |
906 divergent bookmark Z stored as Z@default |
912 divergent bookmark Z stored as Z@default |
907 adding remote bookmark foo |
913 adding remote bookmark foo |
908 adding remote bookmark four |
914 adding remote bookmark four |
909 adding remote bookmark should-end-on-two |
915 adding remote bookmark should-end-on-two |
|
916 new changesets 5fb12f0f2d51 |
910 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
917 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
911 $ hg -R ../cloned-bookmarks-update parents -T "{rev}:{node|short}\n" |
918 $ hg -R ../cloned-bookmarks-update parents -T "{rev}:{node|short}\n" |
912 3:125c9a1d6df6 |
919 3:125c9a1d6df6 |
913 $ hg -R ../cloned-bookmarks-update bookmarks | grep ' Y ' |
920 $ hg -R ../cloned-bookmarks-update bookmarks | grep ' Y ' |
914 * Y 3:125c9a1d6df6 |
921 * Y 3:125c9a1d6df6 |
928 adding changesets |
935 adding changesets |
929 adding manifests |
936 adding manifests |
930 adding file changes |
937 adding file changes |
931 added 1 changesets with 1 changes to 1 files |
938 added 1 changesets with 1 changes to 1 files |
932 divergent bookmark Z stored as Z@default |
939 divergent bookmark Z stored as Z@default |
|
940 new changesets 81dcce76aa0b |
933 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
941 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
934 updating bookmark Y |
942 updating bookmark Y |
935 $ hg -R ../cloned-bookmarks-update parents -T "{rev}:{node|short}\n" |
943 $ hg -R ../cloned-bookmarks-update parents -T "{rev}:{node|short}\n" |
936 6:81dcce76aa0b |
944 6:81dcce76aa0b |
937 $ hg -R ../cloned-bookmarks-update bookmarks | grep ' Y ' |
945 $ hg -R ../cloned-bookmarks-update bookmarks | grep ' Y ' |