equal
deleted
inserted
replaced
28 Test interrupted updates by having a non-empty dir with the same name as one |
28 Test interrupted updates by having a non-empty dir with the same name as one |
29 of the files in a commit we're updating to |
29 of the files in a commit we're updating to |
30 |
30 |
31 $ mkdir b && touch b/nonempty |
31 $ mkdir b && touch b/nonempty |
32 $ hg up |
32 $ hg up |
33 b: untracked directory conflicts with file |
33 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
34 abort: untracked files in working directory differ from files in requested revision |
|
35 [255] |
|
36 $ hg ci |
34 $ hg ci |
37 nothing changed |
35 nothing changed |
38 [1] |
36 [1] |
39 $ hg sum |
37 $ hg sum |
40 parent: 0:538afb845929 |
38 parent: 1:b8bb4a988f25 tip |
41 commit #0 |
39 commit #1 |
42 branch: default |
40 branch: default |
43 commit: 1 unknown (clean) |
41 commit: (clean) |
44 update: 1 new changesets (update) |
42 update: (current) |
45 phases: 2 draft |
43 phases: 2 draft |
46 $ rm b/nonempty |
44 |
|
45 The following line is commented out because the file doesn't exist at the moment, and some OSes error out even with `rm -f`. |
|
46 $ rm b/nonempty |
|
47 |
47 $ hg up |
48 $ hg up |
48 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
49 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
49 $ hg sum |
50 $ hg sum |
50 parent: 1:b8bb4a988f25 tip |
51 parent: 1:b8bb4a988f25 tip |
51 commit #1 |
52 commit #1 |
52 branch: default |
53 branch: default |
53 commit: (clean) |
54 commit: (clean) |