Mercurial > hg
annotate tests/test-remove.t @ 12105:6f58430dfdd0
util: get rid of extra trailing whitespace in parsedate abort message
author | Nicolas Dumazet <nicdumz.commits@gmail.com> |
---|---|
date | Mon, 30 Aug 2010 13:29:44 +0900 |
parents | 54c9549ccb22 |
children | 48735ce02345 |
rev | line source |
---|---|
12099
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
1 $ remove() { |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
2 > hg rm $@ |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
3 > hg st |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
4 > # do not use ls -R, which recurses in .hg subdirs on Mac OS X 10.5 |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
5 > find . -name .hg -prune -o -type f -print | sort |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
6 > hg up -C |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
7 > } |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
8 |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
9 $ hg init a |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
10 $ cd a |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
11 $ echo a > foo |
936 | 12 |
12099
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
13 file not managed |
6346
8e3b651382f5
improved semantics for remove (issue438)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
4394
diff
changeset
|
14 |
12099
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
15 $ remove foo |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
16 not removing foo: file is untracked |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
17 ? foo |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
18 ./foo |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
19 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
20 |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
21 $ hg add foo |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
22 $ hg commit -m1 |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
23 |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
24 the table cases |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
25 00 state added, options none |
6346
8e3b651382f5
improved semantics for remove (issue438)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
4394
diff
changeset
|
26 |
12099
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
27 $ echo b > bar |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
28 $ hg add bar |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
29 $ remove bar |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
30 not removing bar: file has been marked for add (use -f to force removal) |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
31 A bar |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
32 ./bar |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
33 ./foo |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
34 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
6346
8e3b651382f5
improved semantics for remove (issue438)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
4394
diff
changeset
|
35 |
12099
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
36 01 state clean, options none |
6346
8e3b651382f5
improved semantics for remove (issue438)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
4394
diff
changeset
|
37 |
12099
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
38 $ remove foo |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
39 R foo |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
40 ? bar |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
41 ./bar |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
42 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
43 |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
44 02 state modified, options none |
6346
8e3b651382f5
improved semantics for remove (issue438)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
4394
diff
changeset
|
45 |
12099
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
46 $ echo b >> foo |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
47 $ remove foo |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
48 not removing foo: file is modified (use -f to force removal) |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
49 M foo |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
50 ? bar |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
51 ./bar |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
52 ./foo |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
53 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
54 |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
55 03 state missing, options none |
6346
8e3b651382f5
improved semantics for remove (issue438)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
4394
diff
changeset
|
56 |
12099
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
57 $ rm foo |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
58 $ remove foo |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
59 R foo |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
60 ? bar |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
61 ./bar |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
62 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
63 |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
64 10 state added, options -f |
6346
8e3b651382f5
improved semantics for remove (issue438)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
4394
diff
changeset
|
65 |
12099
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
66 $ echo b > bar |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
67 $ hg add bar |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
68 $ remove -f bar |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
69 ? bar |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
70 ./bar |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
71 ./foo |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
72 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
73 $ rm bar |
6346
8e3b651382f5
improved semantics for remove (issue438)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
4394
diff
changeset
|
74 |
12099
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
75 11 state clean, options -f |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
76 |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
77 $ remove -f foo |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
78 R foo |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
79 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
80 |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
81 12 state modified, options -f |
6346
8e3b651382f5
improved semantics for remove (issue438)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
4394
diff
changeset
|
82 |
12099
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
83 $ echo b >> foo |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
84 $ remove -f foo |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
85 R foo |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
86 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
87 |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
88 13 state missing, options -f |
6346
8e3b651382f5
improved semantics for remove (issue438)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
4394
diff
changeset
|
89 |
12099
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
90 $ rm foo |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
91 $ remove -f foo |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
92 R foo |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
93 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
94 |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
95 20 state added, options -A |
6346
8e3b651382f5
improved semantics for remove (issue438)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
4394
diff
changeset
|
96 |
12099
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
97 $ echo b > bar |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
98 $ hg add bar |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
99 $ remove -A bar |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
100 not removing bar: file still exists (use -f to force removal) |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
101 A bar |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
102 ./bar |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
103 ./foo |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
104 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
6346
8e3b651382f5
improved semantics for remove (issue438)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
4394
diff
changeset
|
105 |
12099
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
106 21 state clean, options -A |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
107 |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
108 $ remove -A foo |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
109 not removing foo: file still exists (use -f to force removal) |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
110 ? bar |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
111 ./bar |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
112 ./foo |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
113 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
114 |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
115 22 state modified, options -A |
936 | 116 |
12099
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
117 $ echo b >> foo |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
118 $ remove -A foo |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
119 not removing foo: file still exists (use -f to force removal) |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
120 M foo |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
121 ? bar |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
122 ./bar |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
123 ./foo |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
124 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
6346
8e3b651382f5
improved semantics for remove (issue438)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
4394
diff
changeset
|
125 |
12099
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
126 23 state missing, options -A |
6346
8e3b651382f5
improved semantics for remove (issue438)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
4394
diff
changeset
|
127 |
12099
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
128 $ rm foo |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
129 $ remove -A foo |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
130 R foo |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
131 ? bar |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
132 ./bar |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
133 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
134 |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
135 30 state added, options -Af |
6346
8e3b651382f5
improved semantics for remove (issue438)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
4394
diff
changeset
|
136 |
12099
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
137 $ echo b > bar |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
138 $ hg add bar |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
139 $ remove -Af bar |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
140 ? bar |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
141 ./bar |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
142 ./foo |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
143 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
144 $ rm bar |
6346
8e3b651382f5
improved semantics for remove (issue438)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
4394
diff
changeset
|
145 |
12099
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
146 31 state clean, options -Af |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
147 |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
148 $ remove -Af foo |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
149 R foo |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
150 ./foo |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
151 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
6346
8e3b651382f5
improved semantics for remove (issue438)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
4394
diff
changeset
|
152 |
12099
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
153 32 state modified, options -Af |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
154 |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
155 $ echo b >> foo |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
156 $ remove -Af foo |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
157 R foo |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
158 ./foo |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
159 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
2309
b2f37c7026ca
remove: rewrite to be ~400x faster, bit more friendly
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2180
diff
changeset
|
160 |
12099
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
161 33 state missing, options -Af |
6346
8e3b651382f5
improved semantics for remove (issue438)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
4394
diff
changeset
|
162 |
12099
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
163 $ rm foo |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
164 $ remove -Af foo |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
165 R foo |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
166 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
167 |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
168 test some directory stuff |
6346
8e3b651382f5
improved semantics for remove (issue438)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
4394
diff
changeset
|
169 |
12099
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
170 $ mkdir test |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
171 $ echo a > test/foo |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
172 $ echo b > test/bar |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
173 $ hg ci -Am2 |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
174 adding test/bar |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
175 adding test/foo |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
176 |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
177 dir, options none |
6346
8e3b651382f5
improved semantics for remove (issue438)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
4394
diff
changeset
|
178 |
12099
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
179 $ rm test/bar |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
180 $ remove test |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
181 removing test/bar |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
182 removing test/foo |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
183 R test/bar |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
184 R test/foo |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
185 ./foo |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
186 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
187 |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
188 dir, options -f |
6346
8e3b651382f5
improved semantics for remove (issue438)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
4394
diff
changeset
|
189 |
12099
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
190 $ rm test/bar |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
191 $ remove -f test |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
192 removing test/bar |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
193 removing test/foo |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
194 R test/bar |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
195 R test/foo |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
196 ./foo |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
197 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
198 |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
199 dir, options -A |
6346
8e3b651382f5
improved semantics for remove (issue438)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
4394
diff
changeset
|
200 |
12099
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
201 $ rm test/bar |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
202 $ remove -A test |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
203 not removing test/foo: file still exists (use -f to force removal) |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
204 removing test/bar |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
205 R test/bar |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
206 ./foo |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
207 ./test/foo |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
208 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
6346
8e3b651382f5
improved semantics for remove (issue438)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
4394
diff
changeset
|
209 |
12099
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
210 dir, options -Af |
9572
1f665246dab3
windows: fix unlink() not dropping empty tree (issue1861)
Patrick Mezard <pmezard@gmail.com>
parents:
6358
diff
changeset
|
211 |
12099
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
212 $ rm test/bar |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
213 $ remove -Af test |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
214 removing test/bar |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
215 removing test/foo |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
216 R test/bar |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
217 R test/foo |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
218 ./foo |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
219 ./test/foo |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
220 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
221 |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
222 test remove dropping empty trees (issue1861) |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
223 |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
224 $ mkdir -p issue1861/b/c |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
225 $ echo x > issue1861/x |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
226 $ echo y > issue1861/b/c/y |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
227 $ hg ci -Am add |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
228 adding issue1861/b/c/y |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
229 adding issue1861/x |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
230 $ hg rm issue1861/b |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
231 removing issue1861/b/c/y |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
232 $ hg ci -m remove |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
233 $ ls issue1861 |
54c9549ccb22
tests: unify test-remove
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9572
diff
changeset
|
234 x |