tests/test-tutorial.t
changeset 1036 70de12b7721a
parent 1035 59bc29c84ce0
child 1037 bddee73b361e
equal deleted inserted replaced
1035:59bc29c84ce0 1036:70de12b7721a
   400   searching for changes
   400   searching for changes
   401   adding changesets
   401   adding changesets
   402   adding manifests
   402   adding manifests
   403   adding file changes
   403   adding file changes
   404   added 3 changesets with 3 changes to 1 files
   404   added 3 changesets with 3 changes to 1 files
       
   405   pushing 6 markers (487 bytes)
   405 
   406 
   406 for simplicity sake we get the bathroom change in line again
   407 for simplicity sake we get the bathroom change in line again
   407 
   408 
   408   $ hg grab 10b8aeaa8cc8
   409   $ hg grab 10b8aeaa8cc8
   409   merging shopping
   410   merging shopping
   720   searching for changes
   721   searching for changes
   721   adding changesets
   722   adding changesets
   722   adding manifests
   723   adding manifests
   723   adding file changes
   724   adding file changes
   724   added 2 changesets with 2 changes to 1 files (+1 heads)
   725   added 2 changesets with 2 changes to 1 files (+1 heads)
       
   726   pushing 10 markers (803 bytes)
   725 
   727 
   726 remote get a warning that current working directory is based on an obsolete changeset
   728 remote get a warning that current working directory is based on an obsolete changeset
   727 
   729 
   728   $ cd ../remote
   730   $ cd ../remote
   729   $ hg pull local # we up again to trigger the warning. it was displayed during the push
   731   $ hg pull local # we up again to trigger the warning. it was displayed during the push