comparison tests/test-tutorial.t @ 1452:1bcbd14cf159 stable

merge back with 3.3 compat branch
author Pierre-Yves David <pierre-yves.david@fb.com>
date Thu, 25 Jun 2015 17:37:43 -0700
parents 73eb4f33f9dc
children 8ca31deb8db7 71a3aa0349c5
comparison
equal deleted inserted replaced
1450:5f6e78aea094 1452:1bcbd14cf159
404 searching for changes 404 searching for changes
405 adding changesets 405 adding changesets
406 adding manifests 406 adding manifests
407 adding file changes 407 adding file changes
408 added 3 changesets with 3 changes to 1 files 408 added 3 changesets with 3 changes to 1 files
409 pushing 6 obsolescence markers (529 bytes) 409 pushing 6 obsolescence markers (*) (glob)
410 6 obsolescence markers added 410 6 obsolescence markers added
411 411
412 for simplicity sake we get the bathroom change in line again 412 for simplicity sake we get the bathroom change in line again
413 413
414 $ hg grab 10b8aeaa8cc8 414 $ hg grab 10b8aeaa8cc8
736 searching for changes 736 searching for changes
737 adding changesets 737 adding changesets
738 adding manifests 738 adding manifests
739 adding file changes 739 adding file changes
740 added 2 changesets with 2 changes to 1 files (+1 heads) 740 added 2 changesets with 2 changes to 1 files (+1 heads)
741 pushing 10 obsolescence markers (873 bytes) 741 pushing 10 obsolescence markers (*) (glob)
742 3 obsolescence markers added 742 3 obsolescence markers added
743 743
744 remote get a warning that current working directory is based on an obsolete changeset 744 remote get a warning that current working directory is based on an obsolete changeset
745 745
746 $ cd ../remote 746 $ cd ../remote