##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

tests: remove test-issue322 as it's fully included in test-issue660
Nicolas Dumazet -
r14112:3956ea94 default
parent child Browse files
Show More
Show file before | Show file after | Hide comments
@@ -1,144 +1,145 b''
1 http://mercurial.selenic.com/bts/issue660
1 http://mercurial.selenic.com/bts/issue660 and:
2 http://mercurial.selenic.com/bts/issue322
2
3
3 $ hg init
4 $ hg init
4 $ echo a > a
5 $ echo a > a
5 $ mkdir b
6 $ mkdir b
6 $ echo b > b/b
7 $ echo b > b/b
7 $ hg commit -A -m "a is file, b is dir"
8 $ hg commit -A -m "a is file, b is dir"
8 adding a
9 adding a
9 adding b/b
10 adding b/b
10
11
11 File replaced with directory:
12 File replaced with directory:
12
13
13 $ rm a
14 $ rm a
14 $ mkdir a
15 $ mkdir a
15 $ echo a > a/a
16 $ echo a > a/a
16
17
17 Should fail - would corrupt dirstate:
18 Should fail - would corrupt dirstate:
18
19
19 $ hg add a/a
20 $ hg add a/a
20 abort: file 'a' in dirstate clashes with 'a/a'
21 abort: file 'a' in dirstate clashes with 'a/a'
21 [255]
22 [255]
22
23
23 Removing shadow:
24 Removing shadow:
24
25
25 $ hg rm --after a
26 $ hg rm --after a
26
27
27 Should succeed - shadow removed:
28 Should succeed - shadow removed:
28
29
29 $ hg add a/a
30 $ hg add a/a
30
31
31 Directory replaced with file:
32 Directory replaced with file:
32
33
33 $ rm -r b
34 $ rm -r b
34 $ echo b > b
35 $ echo b > b
35
36
36 Should fail - would corrupt dirstate:
37 Should fail - would corrupt dirstate:
37
38
38 $ hg add b
39 $ hg add b
39 abort: directory 'b' already in dirstate
40 abort: directory 'b' already in dirstate
40 [255]
41 [255]
41
42
42 Removing shadow:
43 Removing shadow:
43
44
44 $ hg rm --after b/b
45 $ hg rm --after b/b
45
46
46 Should succeed - shadow removed:
47 Should succeed - shadow removed:
47
48
48 $ hg add b
49 $ hg add b
49
50
50 Look what we got:
51 Look what we got:
51
52
52 $ hg st
53 $ hg st
53 A a/a
54 A a/a
54 A b
55 A b
55 R a
56 R a
56 R b/b
57 R b/b
57
58
58 Revert reintroducing shadow - should fail:
59 Revert reintroducing shadow - should fail:
59
60
60 $ rm -r a b
61 $ rm -r a b
61 $ hg revert b/b
62 $ hg revert b/b
62 abort: file 'b' in dirstate clashes with 'b/b'
63 abort: file 'b' in dirstate clashes with 'b/b'
63 [255]
64 [255]
64
65
65 Revert all - should succeed:
66 Revert all - should succeed:
66
67
67 $ hg revert --all
68 $ hg revert --all
68 undeleting a
69 undeleting a
69 forgetting a/a
70 forgetting a/a
70 forgetting b
71 forgetting b
71 undeleting b/b
72 undeleting b/b
72
73
73 $ hg st
74 $ hg st
74
75
75 addremove:
76 addremove:
76
77
77 $ rm -r a b
78 $ rm -r a b
78 $ mkdir a
79 $ mkdir a
79 $ echo a > a/a
80 $ echo a > a/a
80 $ echo b > b
81 $ echo b > b
81
82
82 $ hg addremove -s 0
83 $ hg addremove -s 0
83 removing a
84 removing a
84 adding a/a
85 adding a/a
85 adding b
86 adding b
86 removing b/b
87 removing b/b
87
88
88 $ hg st
89 $ hg st
89 A a/a
90 A a/a
90 A b
91 A b
91 R a
92 R a
92 R b/b
93 R b/b
93
94
94 commit:
95 commit:
95
96
96 $ hg ci -A -m "a is dir, b is file"
97 $ hg ci -A -m "a is dir, b is file"
97 $ hg st --all
98 $ hg st --all
98 C a/a
99 C a/a
99 C b
100 C b
100
101
101 Long directory replaced with file:
102 Long directory replaced with file:
102
103
103 $ mkdir d
104 $ mkdir d
104 $ mkdir d/d
105 $ mkdir d/d
105 $ echo d > d/d/d
106 $ echo d > d/d/d
106 $ hg commit -A -m "d is long directory"
107 $ hg commit -A -m "d is long directory"
107 adding d/d/d
108 adding d/d/d
108
109
109 $ rm -r d
110 $ rm -r d
110 $ echo d > d
111 $ echo d > d
111
112
112 Should fail - would corrupt dirstate:
113 Should fail - would corrupt dirstate:
113
114
114 $ hg add d
115 $ hg add d
115 abort: directory 'd' already in dirstate
116 abort: directory 'd' already in dirstate
116 [255]
117 [255]
117
118
118 Removing shadow:
119 Removing shadow:
119
120
120 $ hg rm --after d/d/d
121 $ hg rm --after d/d/d
121
122
122 Should succeed - shadow removed:
123 Should succeed - shadow removed:
123
124
124 $ hg add d
125 $ hg add d
125 $ hg ci -md
126 $ hg ci -md
126
127
127 Update should work at least with clean working directory:
128 Update should work at least with clean working directory:
128
129
129 $ rm -r a b d
130 $ rm -r a b d
130 $ hg up -r 0
131 $ hg up -r 0
131 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
132 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
132
133
133 $ hg st --all
134 $ hg st --all
134 C a
135 C a
135 C b/b
136 C b/b
136
137
137 $ rm -r a b
138 $ rm -r a b
138 $ hg up -r 1
139 $ hg up -r 1
139 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
140 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
140
141
141 $ hg st --all
142 $ hg st --all
142 C a/a
143 C a/a
143 C b
144 C b
144
145
Show file before | Show file after | Hide comments
1 NO CONTENT: file was removed
NO CONTENT: file was removed
General Comments 0
You need to be logged in to leave comments. Login now