Mercurial > hg
comparison tests/test-add.t @ 11795:06793ad30575
tests: unify test-add
author | Nicolas Dumazet <nicdumz.commits@gmail.com> |
---|---|
date | Thu, 12 Aug 2010 19:43:45 +0900 |
parents | tests/test-add@e6162b854ed5 |
children | f2daa6ab514a |
comparison
equal
deleted
inserted
replaced
11794:80c63b2a29a8 | 11795:06793ad30575 |
---|---|
1 $ hg init a | |
2 $ cd a | |
3 $ echo a > a | |
4 $ hg add -n | |
5 adding a | |
6 $ hg st | |
7 ? a | |
8 $ hg add | |
9 adding a | |
10 $ hg st | |
11 A a | |
12 $ hg forget a | |
13 $ hg add | |
14 adding a | |
15 $ hg st | |
16 A a | |
17 | |
18 $ echo b > b | |
19 $ hg add -n b | |
20 $ hg st | |
21 A a | |
22 ? b | |
23 $ hg add b || echo "failed to add b" | |
24 $ hg st | |
25 A a | |
26 A b | |
27 | |
28 should fail | |
29 | |
30 $ hg add b | |
31 b already tracked! | |
32 $ hg st | |
33 A a | |
34 A b | |
35 | |
36 $ hg ci -m 0 --traceback | |
37 | |
38 should fail | |
39 | |
40 $ hg add a | |
41 a already tracked! | |
42 | |
43 $ echo aa > a | |
44 $ hg ci -m 1 | |
45 $ hg up 0 | |
46 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
47 $ echo aaa > a | |
48 $ hg ci -m 2 | |
49 created new head | |
50 | |
51 $ hg merge | |
52 merging a | |
53 warning: conflicts during merge. | |
54 merging a failed! | |
55 0 files updated, 0 files merged, 0 files removed, 1 files unresolved | |
56 use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon | |
57 $ hg st | |
58 M a | |
59 ? a.orig | |
60 | |
61 should fail | |
62 | |
63 $ hg add a | |
64 a already tracked! | |
65 $ hg st | |
66 M a | |
67 ? a.orig | |
68 $ hg resolve -m a | |
69 $ hg ci -m merge | |
70 | |
71 issue683 | |
72 | |
73 $ hg forget a | |
74 $ hg add a | |
75 $ hg st | |
76 ? a.orig | |
77 $ hg rm a | |
78 $ hg st | |
79 R a | |
80 ? a.orig | |
81 $ echo a > a | |
82 $ hg add a | |
83 $ hg st | |
84 M a | |
85 ? a.orig | |
86 | |
87 $ hg add c && echo "unexpected addition of missing file" | |
88 c: No such file or directory | |
89 $ echo c > c | |
90 $ hg add d c && echo "unexpected addition of missing file" | |
91 d: No such file or directory | |
92 $ hg st | |
93 M a | |
94 A c | |
95 ? a.orig | |
96 |