| author | Matt Mackall <mpm@selenic.com> |
| Wed, 22 Sep 2010 17:13:49 -0500 | |
| branch | stable |
| changeset 12379 | 6aa2c86db2eb |
| parent 12129 | 07ac2a560fce |
| permissions | -rw-r--r-- |
|
6346
8e3b651382f5
improved semantics for remove (issue438)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
1 |
% file not managed |
|
8533
6062c6362b2e
remove: warn if unversionned files are specified (issue1454)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
8518
diff
changeset
|
2 |
not removing foo: file is untracked |
|
12129
07ac2a560fce
remove: properly set return code when warnings are issued
Brodie Rao <brodie@bitheap.org>
parents:
9572
diff
changeset
|
3 |
exit code: 1 |
|
6346
8e3b651382f5
improved semantics for remove (issue438)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
4 |
? foo |
|
6356
b34b876d1f6f
test-remove: make it pass on Mac OS X 10.5
Florent Guillaume <fg@nuxeo.com>
parents:
6346
diff
changeset
|
5 |
./foo |
|
6346
8e3b651382f5
improved semantics for remove (issue438)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
6 |
0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
8e3b651382f5
improved semantics for remove (issue438)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
7 |
% 00 state added, options none |
|
8e3b651382f5
improved semantics for remove (issue438)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
8 |
not removing bar: file has been marked for add (use -f to force removal) |
|
12129
07ac2a560fce
remove: properly set return code when warnings are issued
Brodie Rao <brodie@bitheap.org>
parents:
9572
diff
changeset
|
9 |
exit code: 1 |
|
6346
8e3b651382f5
improved semantics for remove (issue438)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
10 |
A bar |
|
6356
b34b876d1f6f
test-remove: make it pass on Mac OS X 10.5
Florent Guillaume <fg@nuxeo.com>
parents:
6346
diff
changeset
|
11 |
./bar |
|
b34b876d1f6f
test-remove: make it pass on Mac OS X 10.5
Florent Guillaume <fg@nuxeo.com>
parents:
6346
diff
changeset
|
12 |
./foo |
|
8518
3f4f14eab085
update --clean: do not unlink added files (issue575)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
6761
diff
changeset
|
13 |
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:
6338
diff
changeset
|
14 |
% 01 state clean, options none |
|
12129
07ac2a560fce
remove: properly set return code when warnings are issued
Brodie Rao <brodie@bitheap.org>
parents:
9572
diff
changeset
|
15 |
exit code: 0 |
|
6346
8e3b651382f5
improved semantics for remove (issue438)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
16 |
R foo |
|
8518
3f4f14eab085
update --clean: do not unlink added files (issue575)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
6761
diff
changeset
|
17 |
? bar |
|
3f4f14eab085
update --clean: do not unlink added files (issue575)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
6761
diff
changeset
|
18 |
./bar |
|
6346
8e3b651382f5
improved semantics for remove (issue438)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
19 |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
8e3b651382f5
improved semantics for remove (issue438)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
20 |
% 02 state modified, options none |
|
8e3b651382f5
improved semantics for remove (issue438)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
21 |
not removing foo: file is modified (use -f to force removal) |
|
12129
07ac2a560fce
remove: properly set return code when warnings are issued
Brodie Rao <brodie@bitheap.org>
parents:
9572
diff
changeset
|
22 |
exit code: 1 |
|
6346
8e3b651382f5
improved semantics for remove (issue438)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
23 |
M foo |
|
8518
3f4f14eab085
update --clean: do not unlink added files (issue575)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
6761
diff
changeset
|
24 |
? bar |
|
3f4f14eab085
update --clean: do not unlink added files (issue575)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
6761
diff
changeset
|
25 |
./bar |
|
6356
b34b876d1f6f
test-remove: make it pass on Mac OS X 10.5
Florent Guillaume <fg@nuxeo.com>
parents:
6346
diff
changeset
|
26 |
./foo |
|
6346
8e3b651382f5
improved semantics for remove (issue438)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
27 |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
8e3b651382f5
improved semantics for remove (issue438)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
28 |
% 03 state missing, options none |
|
12129
07ac2a560fce
remove: properly set return code when warnings are issued
Brodie Rao <brodie@bitheap.org>
parents:
9572
diff
changeset
|
29 |
exit code: 0 |
|
6346
8e3b651382f5
improved semantics for remove (issue438)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
30 |
R foo |
|
8518
3f4f14eab085
update --clean: do not unlink added files (issue575)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
6761
diff
changeset
|
31 |
? bar |
|
3f4f14eab085
update --clean: do not unlink added files (issue575)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
6761
diff
changeset
|
32 |
./bar |
|
6346
8e3b651382f5
improved semantics for remove (issue438)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
33 |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
8e3b651382f5
improved semantics for remove (issue438)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
34 |
% 10 state added, options -f |
|
12129
07ac2a560fce
remove: properly set return code when warnings are issued
Brodie Rao <brodie@bitheap.org>
parents:
9572
diff
changeset
|
35 |
exit code: 0 |
|
6346
8e3b651382f5
improved semantics for remove (issue438)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
36 |
? bar |
|
6356
b34b876d1f6f
test-remove: make it pass on Mac OS X 10.5
Florent Guillaume <fg@nuxeo.com>
parents:
6346
diff
changeset
|
37 |
./bar |
|
b34b876d1f6f
test-remove: make it pass on Mac OS X 10.5
Florent Guillaume <fg@nuxeo.com>
parents:
6346
diff
changeset
|
38 |
./foo |
|
6346
8e3b651382f5
improved semantics for remove (issue438)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
39 |
0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
8e3b651382f5
improved semantics for remove (issue438)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
40 |
% 11 state clean, options -f |
|
12129
07ac2a560fce
remove: properly set return code when warnings are issued
Brodie Rao <brodie@bitheap.org>
parents:
9572
diff
changeset
|
41 |
exit code: 0 |
|
6346
8e3b651382f5
improved semantics for remove (issue438)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
42 |
R foo |
|
8e3b651382f5
improved semantics for remove (issue438)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
43 |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
8e3b651382f5
improved semantics for remove (issue438)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
44 |
% 12 state modified, options -f |
|
12129
07ac2a560fce
remove: properly set return code when warnings are issued
Brodie Rao <brodie@bitheap.org>
parents:
9572
diff
changeset
|
45 |
exit code: 0 |
|
6346
8e3b651382f5
improved semantics for remove (issue438)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
46 |
R foo |
|
8e3b651382f5
improved semantics for remove (issue438)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
47 |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
8e3b651382f5
improved semantics for remove (issue438)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
48 |
% 13 state missing, options -f |
|
12129
07ac2a560fce
remove: properly set return code when warnings are issued
Brodie Rao <brodie@bitheap.org>
parents:
9572
diff
changeset
|
49 |
exit code: 0 |
|
6346
8e3b651382f5
improved semantics for remove (issue438)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
50 |
R foo |
|
8e3b651382f5
improved semantics for remove (issue438)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
51 |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
8e3b651382f5
improved semantics for remove (issue438)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
52 |
% 20 state added, options -A |
|
8e3b651382f5
improved semantics for remove (issue438)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
53 |
not removing bar: file still exists (use -f to force removal) |
|
12129
07ac2a560fce
remove: properly set return code when warnings are issued
Brodie Rao <brodie@bitheap.org>
parents:
9572
diff
changeset
|
54 |
exit code: 1 |
|
6346
8e3b651382f5
improved semantics for remove (issue438)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
55 |
A bar |
|
6356
b34b876d1f6f
test-remove: make it pass on Mac OS X 10.5
Florent Guillaume <fg@nuxeo.com>
parents:
6346
diff
changeset
|
56 |
./bar |
|
b34b876d1f6f
test-remove: make it pass on Mac OS X 10.5
Florent Guillaume <fg@nuxeo.com>
parents:
6346
diff
changeset
|
57 |
./foo |
|
8518
3f4f14eab085
update --clean: do not unlink added files (issue575)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
6761
diff
changeset
|
58 |
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:
6338
diff
changeset
|
59 |
% 21 state clean, options -A |
|
8e3b651382f5
improved semantics for remove (issue438)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
60 |
not removing foo: file still exists (use -f to force removal) |
|
12129
07ac2a560fce
remove: properly set return code when warnings are issued
Brodie Rao <brodie@bitheap.org>
parents:
9572
diff
changeset
|
61 |
exit code: 1 |
|
8518
3f4f14eab085
update --clean: do not unlink added files (issue575)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
6761
diff
changeset
|
62 |
? bar |
|
3f4f14eab085
update --clean: do not unlink added files (issue575)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
6761
diff
changeset
|
63 |
./bar |
|
6356
b34b876d1f6f
test-remove: make it pass on Mac OS X 10.5
Florent Guillaume <fg@nuxeo.com>
parents:
6346
diff
changeset
|
64 |
./foo |
|
6346
8e3b651382f5
improved semantics for remove (issue438)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
65 |
0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
8e3b651382f5
improved semantics for remove (issue438)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
66 |
% 22 state modified, options -A |
|
8e3b651382f5
improved semantics for remove (issue438)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
67 |
not removing foo: file still exists (use -f to force removal) |
|
12129
07ac2a560fce
remove: properly set return code when warnings are issued
Brodie Rao <brodie@bitheap.org>
parents:
9572
diff
changeset
|
68 |
exit code: 1 |
|
6346
8e3b651382f5
improved semantics for remove (issue438)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
69 |
M foo |
|
8518
3f4f14eab085
update --clean: do not unlink added files (issue575)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
6761
diff
changeset
|
70 |
? bar |
|
3f4f14eab085
update --clean: do not unlink added files (issue575)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
6761
diff
changeset
|
71 |
./bar |
|
6356
b34b876d1f6f
test-remove: make it pass on Mac OS X 10.5
Florent Guillaume <fg@nuxeo.com>
parents:
6346
diff
changeset
|
72 |
./foo |
|
6346
8e3b651382f5
improved semantics for remove (issue438)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
73 |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
8e3b651382f5
improved semantics for remove (issue438)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
74 |
% 23 state missing, options -A |
|
12129
07ac2a560fce
remove: properly set return code when warnings are issued
Brodie Rao <brodie@bitheap.org>
parents:
9572
diff
changeset
|
75 |
exit code: 0 |
|
6346
8e3b651382f5
improved semantics for remove (issue438)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
76 |
R foo |
|
8518
3f4f14eab085
update --clean: do not unlink added files (issue575)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
6761
diff
changeset
|
77 |
? bar |
|
3f4f14eab085
update --clean: do not unlink added files (issue575)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
6761
diff
changeset
|
78 |
./bar |
|
6346
8e3b651382f5
improved semantics for remove (issue438)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
79 |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
8e3b651382f5
improved semantics for remove (issue438)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
80 |
% 30 state added, options -Af |
|
12129
07ac2a560fce
remove: properly set return code when warnings are issued
Brodie Rao <brodie@bitheap.org>
parents:
9572
diff
changeset
|
81 |
exit code: 0 |
|
6346
8e3b651382f5
improved semantics for remove (issue438)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
82 |
? bar |
|
6356
b34b876d1f6f
test-remove: make it pass on Mac OS X 10.5
Florent Guillaume <fg@nuxeo.com>
parents:
6346
diff
changeset
|
83 |
./bar |
|
b34b876d1f6f
test-remove: make it pass on Mac OS X 10.5
Florent Guillaume <fg@nuxeo.com>
parents:
6346
diff
changeset
|
84 |
./foo |
|
6346
8e3b651382f5
improved semantics for remove (issue438)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
85 |
0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
8e3b651382f5
improved semantics for remove (issue438)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
86 |
% 31 state clean, options -Af |
|
12129
07ac2a560fce
remove: properly set return code when warnings are issued
Brodie Rao <brodie@bitheap.org>
parents:
9572
diff
changeset
|
87 |
exit code: 0 |
|
6346
8e3b651382f5
improved semantics for remove (issue438)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
88 |
R foo |
|
6356
b34b876d1f6f
test-remove: make it pass on Mac OS X 10.5
Florent Guillaume <fg@nuxeo.com>
parents:
6346
diff
changeset
|
89 |
./foo |
|
6346
8e3b651382f5
improved semantics for remove (issue438)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
90 |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
8e3b651382f5
improved semantics for remove (issue438)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
91 |
% 32 state modified, options -Af |
|
12129
07ac2a560fce
remove: properly set return code when warnings are issued
Brodie Rao <brodie@bitheap.org>
parents:
9572
diff
changeset
|
92 |
exit code: 0 |
|
6346
8e3b651382f5
improved semantics for remove (issue438)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
93 |
R foo |
|
6356
b34b876d1f6f
test-remove: make it pass on Mac OS X 10.5
Florent Guillaume <fg@nuxeo.com>
parents:
6346
diff
changeset
|
94 |
./foo |
|
6346
8e3b651382f5
improved semantics for remove (issue438)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
95 |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
8e3b651382f5
improved semantics for remove (issue438)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
96 |
% 33 state missing, options -Af |
|
12129
07ac2a560fce
remove: properly set return code when warnings are issued
Brodie Rao <brodie@bitheap.org>
parents:
9572
diff
changeset
|
97 |
exit code: 0 |
|
6346
8e3b651382f5
improved semantics for remove (issue438)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
98 |
R foo |
|
8e3b651382f5
improved semantics for remove (issue438)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
99 |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
8e3b651382f5
improved semantics for remove (issue438)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
100 |
adding test/bar |
|
8e3b651382f5
improved semantics for remove (issue438)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
101 |
adding test/foo |
|
8e3b651382f5
improved semantics for remove (issue438)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
102 |
% dir, options none |
|
6761
cb981fc955fb
remove: work directly off status
Matt Mackall <mpm@selenic.com>
parents:
6356
diff
changeset
|
103 |
removing test/bar |
|
6346
8e3b651382f5
improved semantics for remove (issue438)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
104 |
removing test/foo |
|
12129
07ac2a560fce
remove: properly set return code when warnings are issued
Brodie Rao <brodie@bitheap.org>
parents:
9572
diff
changeset
|
105 |
exit code: 0 |
|
6346
8e3b651382f5
improved semantics for remove (issue438)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
106 |
R test/bar |
|
8e3b651382f5
improved semantics for remove (issue438)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
107 |
R test/foo |
|
6356
b34b876d1f6f
test-remove: make it pass on Mac OS X 10.5
Florent Guillaume <fg@nuxeo.com>
parents:
6346
diff
changeset
|
108 |
./foo |
|
6346
8e3b651382f5
improved semantics for remove (issue438)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
109 |
2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
8e3b651382f5
improved semantics for remove (issue438)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
110 |
% dir, options -f |
|
6761
cb981fc955fb
remove: work directly off status
Matt Mackall <mpm@selenic.com>
parents:
6356
diff
changeset
|
111 |
removing test/bar |
|
6346
8e3b651382f5
improved semantics for remove (issue438)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
112 |
removing test/foo |
|
12129
07ac2a560fce
remove: properly set return code when warnings are issued
Brodie Rao <brodie@bitheap.org>
parents:
9572
diff
changeset
|
113 |
exit code: 0 |
|
6346
8e3b651382f5
improved semantics for remove (issue438)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
114 |
R test/bar |
|
8e3b651382f5
improved semantics for remove (issue438)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
115 |
R test/foo |
|
6356
b34b876d1f6f
test-remove: make it pass on Mac OS X 10.5
Florent Guillaume <fg@nuxeo.com>
parents:
6346
diff
changeset
|
116 |
./foo |
|
6346
8e3b651382f5
improved semantics for remove (issue438)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
117 |
2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
8e3b651382f5
improved semantics for remove (issue438)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
118 |
% dir, options -A |
|
8e3b651382f5
improved semantics for remove (issue438)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
119 |
not removing test/foo: file still exists (use -f to force removal) |
|
8e3b651382f5
improved semantics for remove (issue438)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
120 |
removing test/bar |
|
12129
07ac2a560fce
remove: properly set return code when warnings are issued
Brodie Rao <brodie@bitheap.org>
parents:
9572
diff
changeset
|
121 |
exit code: 1 |
|
6346
8e3b651382f5
improved semantics for remove (issue438)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
122 |
R test/bar |
|
6356
b34b876d1f6f
test-remove: make it pass on Mac OS X 10.5
Florent Guillaume <fg@nuxeo.com>
parents:
6346
diff
changeset
|
123 |
./foo |
|
b34b876d1f6f
test-remove: make it pass on Mac OS X 10.5
Florent Guillaume <fg@nuxeo.com>
parents:
6346
diff
changeset
|
124 |
./test/foo |
|
6346
8e3b651382f5
improved semantics for remove (issue438)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
125 |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
8e3b651382f5
improved semantics for remove (issue438)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
126 |
% dir, options -Af |
|
6761
cb981fc955fb
remove: work directly off status
Matt Mackall <mpm@selenic.com>
parents:
6356
diff
changeset
|
127 |
removing test/bar |
|
6346
8e3b651382f5
improved semantics for remove (issue438)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
128 |
removing test/foo |
|
12129
07ac2a560fce
remove: properly set return code when warnings are issued
Brodie Rao <brodie@bitheap.org>
parents:
9572
diff
changeset
|
129 |
exit code: 0 |
|
6346
8e3b651382f5
improved semantics for remove (issue438)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
130 |
R test/bar |
|
8e3b651382f5
improved semantics for remove (issue438)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
131 |
R test/foo |
|
6356
b34b876d1f6f
test-remove: make it pass on Mac OS X 10.5
Florent Guillaume <fg@nuxeo.com>
parents:
6346
diff
changeset
|
132 |
./foo |
|
b34b876d1f6f
test-remove: make it pass on Mac OS X 10.5
Florent Guillaume <fg@nuxeo.com>
parents:
6346
diff
changeset
|
133 |
./test/foo |
|
6346
8e3b651382f5
improved semantics for remove (issue438)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
134 |
2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
9572
1f665246dab3
windows: fix unlink() not dropping empty tree (issue1861)
Patrick Mezard <pmezard@gmail.com>
parents:
8533
diff
changeset
|
135 |
test remove dropping empty trees (issue1861) |
|
1f665246dab3
windows: fix unlink() not dropping empty tree (issue1861)
Patrick Mezard <pmezard@gmail.com>
parents:
8533
diff
changeset
|
136 |
adding issue1861/b/c/y |
|
1f665246dab3
windows: fix unlink() not dropping empty tree (issue1861)
Patrick Mezard <pmezard@gmail.com>
parents:
8533
diff
changeset
|
137 |
adding issue1861/x |
|
1f665246dab3
windows: fix unlink() not dropping empty tree (issue1861)
Patrick Mezard <pmezard@gmail.com>
parents:
8533
diff
changeset
|
138 |
removing issue1861/b/c/y |
|
1f665246dab3
windows: fix unlink() not dropping empty tree (issue1861)
Patrick Mezard <pmezard@gmail.com>
parents:
8533
diff
changeset
|
139 |
x |