tests/test-evolve.t
changeset 823 9aa20585e158
parent 809 5d3ddede6ccf
child 865 5c40b2a4b52f
equal deleted inserted replaced
822:5f5d269278e9 823:9aa20585e158
   382   $ hg clone -Ur 0 alpha beta
   382   $ hg clone -Ur 0 alpha beta
   383   adding changesets
   383   adding changesets
   384   adding manifests
   384   adding manifests
   385   adding file changes
   385   adding file changes
   386   added 1 changesets with 1 changes to 1 files
   386   added 1 changesets with 1 changes to 1 files
       
   387   OBSEXC: pull obsolescence markers
       
   388   OBSEXC: DONE
   387   $ cd alpha
   389   $ cd alpha
   388 
   390 
   389   $ cat << EOF > A
   391   $ cat << EOF > A
   390   > We
   392   > We
   391   > need
   393   > need
   438   searching for changes
   440   searching for changes
   439   adding changesets
   441   adding changesets
   440   adding manifests
   442   adding manifests
   441   adding file changes
   443   adding file changes
   442   added 1 changesets with 1 changes to 1 files
   444   added 1 changesets with 1 changes to 1 files
       
   445   OBSEXC: pull obsolescence markers
       
   446   OBSEXC: merging obsolescence markers (171 bytes)
       
   447   OBSEXC: 2 markers added
       
   448   OBSEXC: DONE
   443   (run 'hg update' to get a working copy)
   449   (run 'hg update' to get a working copy)
   444   $ hg up
   450   $ hg up
   445   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
   451   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
   446 
   452 
   447   $ cd ..
   453   $ cd ..