Mercurial > hg
annotate tests/test-remove.out @ 8523:5b7da468531b
tests: replace #...# syntax with {...}
author | Martin Geisler <mg@lazybytes.net> |
---|---|
date | Tue, 19 May 2009 23:02:17 +0200 |
parents | 3f4f14eab085 |
children | 6062c6362b2e |
rev | line source |
---|---|
6346
8e3b651382f5
improved semantics for remove (issue438)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
1 % file not managed |
8e3b651382f5
improved semantics for remove (issue438)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
2 ? foo |
6356
b34b876d1f6f
test-remove: make it pass on Mac OS X 10.5
Florent Guillaume <fg@nuxeo.com>
parents:
6346
diff
changeset
|
3 ./foo |
6346
8e3b651382f5
improved semantics for remove (issue438)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
4 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
|
5 % 00 state added, options none |
8e3b651382f5
improved semantics for remove (issue438)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
6 not removing bar: file has been marked for add (use -f to force removal) |
8e3b651382f5
improved semantics for remove (issue438)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
7 A bar |
6356
b34b876d1f6f
test-remove: make it pass on Mac OS X 10.5
Florent Guillaume <fg@nuxeo.com>
parents:
6346
diff
changeset
|
8 ./bar |
b34b876d1f6f
test-remove: make it pass on Mac OS X 10.5
Florent Guillaume <fg@nuxeo.com>
parents:
6346
diff
changeset
|
9 ./foo |
8518
3f4f14eab085
update --clean: do not unlink added files (issue575)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
6761
diff
changeset
|
10 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
|
11 % 01 state clean, options none |
8e3b651382f5
improved semantics for remove (issue438)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
12 R foo |
8518
3f4f14eab085
update --clean: do not unlink added files (issue575)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
6761
diff
changeset
|
13 ? bar |
3f4f14eab085
update --clean: do not unlink added files (issue575)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
6761
diff
changeset
|
14 ./bar |
6346
8e3b651382f5
improved semantics for remove (issue438)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
15 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
|
16 % 02 state modified, options none |
8e3b651382f5
improved semantics for remove (issue438)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
17 not removing foo: file is modified (use -f to force removal) |
8e3b651382f5
improved semantics for remove (issue438)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
18 M foo |
8518
3f4f14eab085
update --clean: do not unlink added files (issue575)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
6761
diff
changeset
|
19 ? bar |
3f4f14eab085
update --clean: do not unlink added files (issue575)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
6761
diff
changeset
|
20 ./bar |
6356
b34b876d1f6f
test-remove: make it pass on Mac OS X 10.5
Florent Guillaume <fg@nuxeo.com>
parents:
6346
diff
changeset
|
21 ./foo |
6346
8e3b651382f5
improved semantics for remove (issue438)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
22 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
|
23 % 03 state missing, options none |
8e3b651382f5
improved semantics for remove (issue438)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
24 R foo |
8518
3f4f14eab085
update --clean: do not unlink added files (issue575)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
6761
diff
changeset
|
25 ? bar |
3f4f14eab085
update --clean: do not unlink added files (issue575)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
6761
diff
changeset
|
26 ./bar |
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 % 10 state added, options -f |
8e3b651382f5
improved semantics for remove (issue438)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
29 ? bar |
6356
b34b876d1f6f
test-remove: make it pass on Mac OS X 10.5
Florent Guillaume <fg@nuxeo.com>
parents:
6346
diff
changeset
|
30 ./bar |
b34b876d1f6f
test-remove: make it pass on Mac OS X 10.5
Florent Guillaume <fg@nuxeo.com>
parents:
6346
diff
changeset
|
31 ./foo |
6346
8e3b651382f5
improved semantics for remove (issue438)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
32 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
|
33 % 11 state clean, options -f |
8e3b651382f5
improved semantics for remove (issue438)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
34 R foo |
8e3b651382f5
improved semantics for remove (issue438)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
35 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
|
36 % 12 state modified, options -f |
8e3b651382f5
improved semantics for remove (issue438)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
37 R foo |
8e3b651382f5
improved semantics for remove (issue438)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
38 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
|
39 % 13 state missing, options -f |
8e3b651382f5
improved semantics for remove (issue438)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
40 R foo |
8e3b651382f5
improved semantics for remove (issue438)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
41 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
|
42 % 20 state added, options -A |
8e3b651382f5
improved semantics for remove (issue438)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
43 not removing bar: file still exists (use -f to force removal) |
8e3b651382f5
improved semantics for remove (issue438)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
44 A bar |
6356
b34b876d1f6f
test-remove: make it pass on Mac OS X 10.5
Florent Guillaume <fg@nuxeo.com>
parents:
6346
diff
changeset
|
45 ./bar |
b34b876d1f6f
test-remove: make it pass on Mac OS X 10.5
Florent Guillaume <fg@nuxeo.com>
parents:
6346
diff
changeset
|
46 ./foo |
8518
3f4f14eab085
update --clean: do not unlink added files (issue575)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
6761
diff
changeset
|
47 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
|
48 % 21 state clean, options -A |
8e3b651382f5
improved semantics for remove (issue438)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
49 not removing foo: file still exists (use -f to force removal) |
8518
3f4f14eab085
update --clean: do not unlink added files (issue575)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
6761
diff
changeset
|
50 ? bar |
3f4f14eab085
update --clean: do not unlink added files (issue575)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
6761
diff
changeset
|
51 ./bar |
6356
b34b876d1f6f
test-remove: make it pass on Mac OS X 10.5
Florent Guillaume <fg@nuxeo.com>
parents:
6346
diff
changeset
|
52 ./foo |
6346
8e3b651382f5
improved semantics for remove (issue438)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
53 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
|
54 % 22 state modified, options -A |
8e3b651382f5
improved semantics for remove (issue438)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
55 not removing foo: file still exists (use -f to force removal) |
8e3b651382f5
improved semantics for remove (issue438)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
56 M foo |
8518
3f4f14eab085
update --clean: do not unlink added files (issue575)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
6761
diff
changeset
|
57 ? bar |
3f4f14eab085
update --clean: do not unlink added files (issue575)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
6761
diff
changeset
|
58 ./bar |
6356
b34b876d1f6f
test-remove: make it pass on Mac OS X 10.5
Florent Guillaume <fg@nuxeo.com>
parents:
6346
diff
changeset
|
59 ./foo |
6346
8e3b651382f5
improved semantics for remove (issue438)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
60 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
|
61 % 23 state missing, options -A |
8e3b651382f5
improved semantics for remove (issue438)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
62 R foo |
8518
3f4f14eab085
update --clean: do not unlink added files (issue575)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
6761
diff
changeset
|
63 ? bar |
3f4f14eab085
update --clean: do not unlink added files (issue575)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
6761
diff
changeset
|
64 ./bar |
6346
8e3b651382f5
improved semantics for remove (issue438)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
65 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
|
66 % 30 state added, options -Af |
8e3b651382f5
improved semantics for remove (issue438)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
67 ? bar |
6356
b34b876d1f6f
test-remove: make it pass on Mac OS X 10.5
Florent Guillaume <fg@nuxeo.com>
parents:
6346
diff
changeset
|
68 ./bar |
b34b876d1f6f
test-remove: make it pass on Mac OS X 10.5
Florent Guillaume <fg@nuxeo.com>
parents:
6346
diff
changeset
|
69 ./foo |
6346
8e3b651382f5
improved semantics for remove (issue438)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
70 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
|
71 % 31 state clean, options -Af |
8e3b651382f5
improved semantics for remove (issue438)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
72 R foo |
6356
b34b876d1f6f
test-remove: make it pass on Mac OS X 10.5
Florent Guillaume <fg@nuxeo.com>
parents:
6346
diff
changeset
|
73 ./foo |
6346
8e3b651382f5
improved semantics for remove (issue438)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
74 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
|
75 % 32 state modified, options -Af |
8e3b651382f5
improved semantics for remove (issue438)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
76 R foo |
6356
b34b876d1f6f
test-remove: make it pass on Mac OS X 10.5
Florent Guillaume <fg@nuxeo.com>
parents:
6346
diff
changeset
|
77 ./foo |
6346
8e3b651382f5
improved semantics for remove (issue438)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
78 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
|
79 % 33 state missing, options -Af |
8e3b651382f5
improved semantics for remove (issue438)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
80 R foo |
8e3b651382f5
improved semantics for remove (issue438)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
81 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
|
82 adding test/bar |
8e3b651382f5
improved semantics for remove (issue438)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
83 adding test/foo |
8e3b651382f5
improved semantics for remove (issue438)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
84 % dir, options none |
6761
cb981fc955fb
remove: work directly off status
Matt Mackall <mpm@selenic.com>
parents:
6356
diff
changeset
|
85 removing test/bar |
6346
8e3b651382f5
improved semantics for remove (issue438)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
86 removing test/foo |
8e3b651382f5
improved semantics for remove (issue438)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
87 R test/bar |
8e3b651382f5
improved semantics for remove (issue438)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
88 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
|
89 ./foo |
6346
8e3b651382f5
improved semantics for remove (issue438)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
90 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
|
91 % dir, options -f |
6761
cb981fc955fb
remove: work directly off status
Matt Mackall <mpm@selenic.com>
parents:
6356
diff
changeset
|
92 removing test/bar |
6346
8e3b651382f5
improved semantics for remove (issue438)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
93 removing test/foo |
8e3b651382f5
improved semantics for remove (issue438)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
94 R test/bar |
8e3b651382f5
improved semantics for remove (issue438)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
95 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
|
96 ./foo |
6346
8e3b651382f5
improved semantics for remove (issue438)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
97 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
|
98 % dir, options -A |
8e3b651382f5
improved semantics for remove (issue438)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
99 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
|
100 removing test/bar |
8e3b651382f5
improved semantics for remove (issue438)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
101 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
|
102 ./foo |
b34b876d1f6f
test-remove: make it pass on Mac OS X 10.5
Florent Guillaume <fg@nuxeo.com>
parents:
6346
diff
changeset
|
103 ./test/foo |
6346
8e3b651382f5
improved semantics for remove (issue438)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
104 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
|
105 % dir, options -Af |
6761
cb981fc955fb
remove: work directly off status
Matt Mackall <mpm@selenic.com>
parents:
6356
diff
changeset
|
106 removing test/bar |
6346
8e3b651382f5
improved semantics for remove (issue438)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
107 removing test/foo |
8e3b651382f5
improved semantics for remove (issue438)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
108 R test/bar |
8e3b651382f5
improved semantics for remove (issue438)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
109 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
|
110 ./foo |
b34b876d1f6f
test-remove: make it pass on Mac OS X 10.5
Florent Guillaume <fg@nuxeo.com>
parents:
6346
diff
changeset
|
111 ./test/foo |
6346
8e3b651382f5
improved semantics for remove (issue438)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
112 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |