Mercurial > hg

comparison tests/test-remove.out @ 8518:3f4f14eab085

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
update --clean: do not unlink added files (issue575)
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Tue, 19 May 2009 03:59:58 +0200
parents cb981fc955fb
children 6062c6362b2e
comparison
equal deleted inserted replaced
8517:110763cc3ab0 8518:3f4f14eab085
5 % 00 state added, options none 5 % 00 state added, options none
6 not removing bar: file has been marked for add (use -f to force removal) 6 not removing bar: file has been marked for add (use -f to force removal)
7 A bar 7 A bar
8 ./bar 8 ./bar
9 ./foo 9 ./foo
10 0 files updated, 0 files merged, 1 files removed, 0 files unresolved 10 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
11 % 01 state clean, options none 11 % 01 state clean, options none
12 R foo 12 R foo
13 ? bar
14 ./bar
13 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 15 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
14 % 02 state modified, options none 16 % 02 state modified, options none
15 not removing foo: file is modified (use -f to force removal) 17 not removing foo: file is modified (use -f to force removal)
16 M foo 18 M foo
19 ? bar
20 ./bar
17 ./foo 21 ./foo
18 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 22 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
19 % 03 state missing, options none 23 % 03 state missing, options none
20 R foo 24 R foo
25 ? bar
26 ./bar
21 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 27 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
22 % 10 state added, options -f 28 % 10 state added, options -f
23 ? bar 29 ? bar
24 ./bar 30 ./bar
25 ./foo 31 ./foo
36 % 20 state added, options -A 42 % 20 state added, options -A
37 not removing bar: file still exists (use -f to force removal) 43 not removing bar: file still exists (use -f to force removal)
38 A bar 44 A bar
39 ./bar 45 ./bar
40 ./foo 46 ./foo
41 0 files updated, 0 files merged, 1 files removed, 0 files unresolved 47 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
42 % 21 state clean, options -A 48 % 21 state clean, options -A
43 not removing foo: file still exists (use -f to force removal) 49 not removing foo: file still exists (use -f to force removal)
50 ? bar
51 ./bar
44 ./foo 52 ./foo
45 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 53 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
46 % 22 state modified, options -A 54 % 22 state modified, options -A
47 not removing foo: file still exists (use -f to force removal) 55 not removing foo: file still exists (use -f to force removal)
48 M foo 56 M foo
57 ? bar
58 ./bar
49 ./foo 59 ./foo
50 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 60 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
51 % 23 state missing, options -A 61 % 23 state missing, options -A
52 R foo 62 R foo
63 ? bar
64 ./bar
53 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 65 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
54 % 30 state added, options -Af 66 % 30 state added, options -Af
55 ? bar 67 ? bar
56 ./bar 68 ./bar
57 ./foo 69 ./foo