tests/test-import.t
branchstable
changeset 35167 9fb2b0b41bec
parent 34661 eb586ed5d8ce
child 35186 aef2b98d9352
equal deleted inserted replaced
35166:ba6324ee49e9 35167:9fb2b0b41bec
   970   patching file a
   970   patching file a
   971   patching file b
   971   patching file b
   972   adding b
   972   adding b
   973   recording removal of a as rename to b (88% similar)
   973   recording removal of a as rename to b (88% similar)
   974   applied to working directory
   974   applied to working directory
       
   975   $ echo 'mod b' > b
   975   $ hg st -C
   976   $ hg st -C
   976   A b
   977   A b
   977     a
   978     a
   978   R a
   979   R a
   979   $ hg revert -a
   980   $ hg revert -a
   980   undeleting a
   981   undeleting a
   981   forgetting b
   982   forgetting b
       
   983   $ cat b
       
   984   mod b
   982   $ rm b
   985   $ rm b
   983   $ hg import --no-commit -v -s 100 ../rename.diff -p2
   986   $ hg import --no-commit -v -s 100 ../rename.diff -p2
   984   applying ../rename.diff
   987   applying ../rename.diff
   985   patching file a
   988   patching file a
   986   patching file b
   989   patching file b