Mercurial > hg

comparison tests/test-bundle2.t @ 22626:fb74a5833467

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
pull: gather all bookmark-pulling code together Pulling bookmarks is done in two rounds. First we do a simple update, then we use the content of the `bookmark` argument to possibly overwrite some bookmark with their remote location. The second step was not done right after the first one for some obscure reason. We now perform them one after the other.
author Pierre-Yves David <pierre-yves.david@fb.com>
date Thu, 25 Sep 2014 17:53:27 -0700
parents e2806b8613ca
children b901645a8784
comparison
equal deleted inserted replaced
22625:62ab9ca90b36 22626:fb74a5833467
905 adding manifests 905 adding manifests
906 adding file changes 906 adding file changes
907 added 1 changesets with 1 changes to 1 files (+1 heads) 907 added 1 changesets with 1 changes to 1 files (+1 heads)
908 1 new obsolescence markers 908 1 new obsolescence markers
909 updating bookmark book_02de 909 updating bookmark book_02de
910 importing bookmark book_02de
910 (run 'hg heads' to see heads, 'hg merge' to merge) 911 (run 'hg heads' to see heads, 'hg merge' to merge)
911 importing bookmark book_02de
912 $ hg -R other debugobsolete 912 $ hg -R other debugobsolete
913 1111111111111111111111111111111111111111 9520eea781bcca16c1e15acc0ba14335a0e8e5ba 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} 913 1111111111111111111111111111111111111111 9520eea781bcca16c1e15acc0ba14335a0e8e5ba 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
914 2222222222222222222222222222222222222222 24b6387c8c8cae37178880f3fa95ded3cb1cf785 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} 914 2222222222222222222222222222222222222222 24b6387c8c8cae37178880f3fa95ded3cb1cf785 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
915 3333333333333333333333333333333333333333 eea13746799a9e0bfd88f29d3c2e9dc9389f524f 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} 915 3333333333333333333333333333333333333333 eea13746799a9e0bfd88f29d3c2e9dc9389f524f 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
916 4444444444444444444444444444444444444444 02de42196ebee42ef284b6780a87cdc96e8eaab6 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} 916 4444444444444444444444444444444444444444 02de42196ebee42ef284b6780a87cdc96e8eaab6 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
927 adding manifests 927 adding manifests
928 adding file changes 928 adding file changes
929 added 1 changesets with 1 changes to 1 files (+1 heads) 929 added 1 changesets with 1 changes to 1 files (+1 heads)
930 1 new obsolescence markers 930 1 new obsolescence markers
931 updating bookmark book_42cc 931 updating bookmark book_42cc
932 importing bookmark book_42cc
932 (run 'hg heads .' to see heads, 'hg merge' to merge) 933 (run 'hg heads .' to see heads, 'hg merge' to merge)
933 importing bookmark book_42cc
934 $ cat main-error.log 934 $ cat main-error.log
935 $ hg -R other debugobsolete 935 $ hg -R other debugobsolete
936 1111111111111111111111111111111111111111 9520eea781bcca16c1e15acc0ba14335a0e8e5ba 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} 936 1111111111111111111111111111111111111111 9520eea781bcca16c1e15acc0ba14335a0e8e5ba 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
937 2222222222222222222222222222222222222222 24b6387c8c8cae37178880f3fa95ded3cb1cf785 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} 937 2222222222222222222222222222222222222222 24b6387c8c8cae37178880f3fa95ded3cb1cf785 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
938 3333333333333333333333333333333333333333 eea13746799a9e0bfd88f29d3c2e9dc9389f524f 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} 938 3333333333333333333333333333333333333333 eea13746799a9e0bfd88f29d3c2e9dc9389f524f 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}