tests/test-tutorial.t
changeset 1092 85c699c4fba4
parent 1064 95d84c8b4bcc
child 1107 1c227ecb744d
equal deleted inserted replaced
1091:236a8e81551e 1092:85c699c4fba4
   402   adding changesets
   402   adding changesets
   403   adding manifests
   403   adding manifests
   404   adding file changes
   404   adding file changes
   405   added 3 changesets with 3 changes to 1 files
   405   added 3 changesets with 3 changes to 1 files
   406   pushing 6 obsolescence markers (487 bytes)
   406   pushing 6 obsolescence markers (487 bytes)
       
   407   6 obsolescence markers added
   407 
   408 
   408 for simplicity sake we get the bathroom change in line again
   409 for simplicity sake we get the bathroom change in line again
   409 
   410 
   410   $ hg grab 10b8aeaa8cc8
   411   $ hg grab 10b8aeaa8cc8
   411   merging shopping
   412   merging shopping
   730   adding changesets
   731   adding changesets
   731   adding manifests
   732   adding manifests
   732   adding file changes
   733   adding file changes
   733   added 2 changesets with 2 changes to 1 files (+1 heads)
   734   added 2 changesets with 2 changes to 1 files (+1 heads)
   734   pushing 10 obsolescence markers (803 bytes)
   735   pushing 10 obsolescence markers (803 bytes)
       
   736   3 obsolescence markers added
   735 
   737 
   736 remote get a warning that current working directory is based on an obsolete changeset
   738 remote get a warning that current working directory is based on an obsolete changeset
   737 
   739 
   738   $ cd ../remote
   740   $ cd ../remote
   739   $ hg pull local # we up again to trigger the warning. it was displayed during the push
   741   $ hg pull local # we up again to trigger the warning. it was displayed during the push