Mercurial > hg

comparison tests/test-bundle2.t @ 22659:798185707833

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
pull: merge bookmark updates and imports We do all the things in one go now, updating existing bookmark, adding new ones, and overwriting the ones explicitly specified for --bookmark. This impacts the tests by removing some duplicated or unnecessary output.
author Pierre-Yves David <pierre-yves.david@fb.com>
date Sun, 28 Sep 2014 14:07:56 -0700
parents b901645a8784
children
comparison
equal deleted inserted replaced
22658:a8f0d8e4c80a 22659:798185707833
904 adding manifests 904 adding manifests
905 adding file changes 905 adding file changes
906 added 1 changesets with 1 changes to 1 files (+1 heads) 906 added 1 changesets with 1 changes to 1 files (+1 heads)
907 1 new obsolescence markers 907 1 new obsolescence markers
908 updating bookmark book_02de 908 updating bookmark book_02de
909 importing bookmark book_02de
910 (run 'hg heads' to see heads, 'hg merge' to merge) 909 (run 'hg heads' to see heads, 'hg merge' to merge)
911 $ hg -R other debugobsolete 910 $ hg -R other debugobsolete
912 1111111111111111111111111111111111111111 9520eea781bcca16c1e15acc0ba14335a0e8e5ba 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} 911 1111111111111111111111111111111111111111 9520eea781bcca16c1e15acc0ba14335a0e8e5ba 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
913 2222222222222222222222222222222222222222 24b6387c8c8cae37178880f3fa95ded3cb1cf785 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} 912 2222222222222222222222222222222222222222 24b6387c8c8cae37178880f3fa95ded3cb1cf785 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
914 3333333333333333333333333333333333333333 eea13746799a9e0bfd88f29d3c2e9dc9389f524f 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} 913 3333333333333333333333333333333333333333 eea13746799a9e0bfd88f29d3c2e9dc9389f524f 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
926 adding manifests 925 adding manifests
927 adding file changes 926 adding file changes
928 added 1 changesets with 1 changes to 1 files (+1 heads) 927 added 1 changesets with 1 changes to 1 files (+1 heads)
929 1 new obsolescence markers 928 1 new obsolescence markers
930 updating bookmark book_42cc 929 updating bookmark book_42cc
931 importing bookmark book_42cc
932 (run 'hg heads .' to see heads, 'hg merge' to merge) 930 (run 'hg heads .' to see heads, 'hg merge' to merge)
933 $ cat main-error.log 931 $ cat main-error.log
934 $ hg -R other debugobsolete 932 $ hg -R other debugobsolete
935 1111111111111111111111111111111111111111 9520eea781bcca16c1e15acc0ba14335a0e8e5ba 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} 933 1111111111111111111111111111111111111111 9520eea781bcca16c1e15acc0ba14335a0e8e5ba 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
936 2222222222222222222222222222222222222222 24b6387c8c8cae37178880f3fa95ded3cb1cf785 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} 934 2222222222222222222222222222222222222222 24b6387c8c8cae37178880f3fa95ded3cb1cf785 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}