equal
deleted
inserted
replaced
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 |