tests/test-transplant.t
changeset 16912 6ef3107c661e
parent 16627 38c45a99be0b
child 16972 5efe9c6a34fe
equal deleted inserted replaced
16911:39d38f16a3f7 16912:6ef3107c661e
   439   $ chmod +x test-filter-invalid-log
   439   $ chmod +x test-filter-invalid-log
   440   $ hg transplant -s ../t --filter ./test-filter-invalid-log 0
   440   $ hg transplant -s ../t --filter ./test-filter-invalid-log 0
   441   filtering * (glob)
   441   filtering * (glob)
   442   abort: filter corrupted changeset (no user or date)
   442   abort: filter corrupted changeset (no user or date)
   443   [255]
   443   [255]
       
   444   $ cd ..
   444 
   445 
   445 test with a win32ext like setup (differing EOLs)
   446 test with a win32ext like setup (differing EOLs)
   446 
   447 
   447   $ hg init twin1
   448   $ hg init twin1
   448   $ cd twin1
   449   $ cd twin1
   497   $ cd ..
   498   $ cd ..
   498 
   499 
   499   $ hg init merge1b
   500   $ hg init merge1b
   500   $ cd merge1b
   501   $ cd merge1b
   501   $ hg transplant -s ../merge1a tip
   502   $ hg transplant -s ../merge1a tip
       
   503   $ cd ..
   502 
   504 
   503 test transplant with merge changeset accepts --parent
   505 test transplant with merge changeset accepts --parent
   504 
   506 
   505   $ hg init merge2a
   507   $ hg init merge2a
   506   $ cd merge2a
   508   $ cd merge2a
   525   $ hg init merge2b
   527   $ hg init merge2b
   526   $ cd merge2b
   528   $ cd merge2b
   527   $ hg transplant -s ../merge2a --parent 0 tip
   529   $ hg transplant -s ../merge2a --parent 0 tip
   528   applying be9f9b39483f
   530   applying be9f9b39483f
   529   be9f9b39483f transplanted to 9959e51f94d1
   531   be9f9b39483f transplanted to 9959e51f94d1
       
   532   $ cd ..