equal
deleted
inserted
replaced
27 $ hg import --no-commit ../unknown.diff |
27 $ hg import --no-commit ../unknown.diff |
28 applying ../unknown.diff |
28 applying ../unknown.diff |
29 file added already exists |
29 file added already exists |
30 1 out of 1 hunks FAILED -- saving rejects to file added.rej |
30 1 out of 1 hunks FAILED -- saving rejects to file added.rej |
31 abort: patch failed to apply |
31 abort: patch failed to apply |
32 [255] |
32 [20] |
33 |
33 |
34 Test modifying an unknown file |
34 Test modifying an unknown file |
35 |
35 |
36 $ hg revert -aq |
36 $ hg revert -aq |
37 $ hg purge |
37 $ hg purge |
39 $ hg ci -m removechanged |
39 $ hg ci -m removechanged |
40 $ echo a > changed |
40 $ echo a > changed |
41 $ hg import --no-commit ../unknown.diff |
41 $ hg import --no-commit ../unknown.diff |
42 applying ../unknown.diff |
42 applying ../unknown.diff |
43 abort: cannot patch changed: file is not tracked |
43 abort: cannot patch changed: file is not tracked |
44 [255] |
44 [20] |
45 |
45 |
46 Test removing an unknown file |
46 Test removing an unknown file |
47 |
47 |
48 $ hg up -qC 0 |
48 $ hg up -qC 0 |
49 $ hg purge |
49 $ hg purge |
52 created new head |
52 created new head |
53 $ echo a > removed |
53 $ echo a > removed |
54 $ hg import --no-commit ../unknown.diff |
54 $ hg import --no-commit ../unknown.diff |
55 applying ../unknown.diff |
55 applying ../unknown.diff |
56 abort: cannot patch removed: file is not tracked |
56 abort: cannot patch removed: file is not tracked |
57 [255] |
57 [20] |
58 |
58 |
59 Test copying onto an unknown file |
59 Test copying onto an unknown file |
60 |
60 |
61 $ hg up -qC 0 |
61 $ hg up -qC 0 |
62 $ hg purge |
62 $ hg purge |
63 $ echo a > copied |
63 $ echo a > copied |
64 $ hg import --no-commit ../unknown.diff |
64 $ hg import --no-commit ../unknown.diff |
65 applying ../unknown.diff |
65 applying ../unknown.diff |
66 abort: cannot create copied: destination already exists |
66 abort: cannot create copied: destination already exists |
67 [255] |
67 [20] |
68 |
68 |
69 $ cd .. |
69 $ cd .. |