tests/test-evolve.t
changeset 1035 59bc29c84ce0
parent 1032 0fcddde7dae6
child 1038 45c4739e85dc
equal deleted inserted replaced
1034:5fd28e46e8f5 1035:59bc29c84ce0
   404   $ hg clone -Ur 0 alpha beta
   404   $ hg clone -Ur 0 alpha beta
   405   adding changesets
   405   adding changesets
   406   adding manifests
   406   adding manifests
   407   adding file changes
   407   adding file changes
   408   added 1 changesets with 1 changes to 1 files
   408   added 1 changesets with 1 changes to 1 files
   409   OBSEXC: pull obsolescence markers
       
   410   OBSEXC: no unknown remote markers
       
   411   OBSEXC: DONE
       
   412   $ cd alpha
   409   $ cd alpha
   413 
   410 
   414   $ cat << EOF > A
   411   $ cat << EOF > A
   415   > We
   412   > We
   416   > need
   413   > need
   463   searching for changes
   460   searching for changes
   464   adding changesets
   461   adding changesets
   465   adding manifests
   462   adding manifests
   466   adding file changes
   463   adding file changes
   467   added 1 changesets with 1 changes to 1 files
   464   added 1 changesets with 1 changes to 1 files
   468   OBSEXC: pull obsolescence markers
       
   469   OBSEXC: merging obsolescence markers (171 bytes)
       
   470   OBSEXC: 2 markers added
       
   471   OBSEXC: DONE
       
   472   (run 'hg update' to get a working copy)
   465   (run 'hg update' to get a working copy)
   473   $ hg up
   466   $ hg up
   474   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
   467   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
   475 
   468 
   476   $ cd ..
   469   $ cd ..