equal
deleted
inserted
replaced
9 $ unset HGMERGE |
9 $ unset HGMERGE |
10 |
10 |
11 $ status() { |
11 $ status() { |
12 > echo "--- status ---" |
12 > echo "--- status ---" |
13 > hg st -A file1 file2 file3 |
13 > hg st -A file1 file2 file3 |
|
14 > echo "--- resolve --list ---" |
|
15 > hg resolve --list file1 file2 file3 |
14 > for file in file1 file2 file3; do |
16 > for file in file1 file2 file3; do |
15 > if [ -f $file ]; then |
17 > if [ -f $file ]; then |
16 > echo "--- $file ---" |
18 > echo "--- $file ---" |
17 > cat $file |
19 > cat $file |
18 > else |
20 > else |
62 $ status |
64 $ status |
63 --- status --- |
65 --- status --- |
64 M file2 |
66 M file2 |
65 M file3 |
67 M file3 |
66 C file1 |
68 C file1 |
|
69 --- resolve --list --- |
|
70 U file3 |
67 --- file1 --- |
71 --- file1 --- |
68 1 |
72 1 |
69 changed |
73 changed |
70 --- file2 --- |
74 --- file2 --- |
71 2 |
75 2 |
101 $ status |
105 $ status |
102 --- status --- |
106 --- status --- |
103 file2: * (glob) |
107 file2: * (glob) |
104 M file3 |
108 M file3 |
105 C file1 |
109 C file1 |
|
110 --- resolve --list --- |
|
111 U file3 |
106 --- file1 --- |
112 --- file1 --- |
107 1 |
113 1 |
108 changed |
114 changed |
109 *** file2 does not exist |
115 *** file2 does not exist |
110 --- file3 --- |
116 --- file3 --- |
150 $ status |
156 $ status |
151 --- status --- |
157 --- status --- |
152 M file2 |
158 M file2 |
153 M file3 |
159 M file3 |
154 R file1 |
160 R file1 |
|
161 --- resolve --list --- |
|
162 U file3 |
155 *** file1 does not exist |
163 *** file1 does not exist |
156 --- file2 --- |
164 --- file2 --- |
157 2 |
165 2 |
158 changed |
166 changed |
159 --- file3 --- |
167 --- file3 --- |
182 $ status |
190 $ status |
183 --- status --- |
191 --- status --- |
184 file2: * (glob) |
192 file2: * (glob) |
185 C file1 |
193 C file1 |
186 C file3 |
194 C file3 |
|
195 --- resolve --list --- |
187 --- file1 --- |
196 --- file1 --- |
188 1 |
197 1 |
189 changed |
198 changed |
190 *** file2 does not exist |
199 *** file2 does not exist |
191 --- file3 --- |
200 --- file3 --- |
207 $ status |
216 $ status |
208 --- status --- |
217 --- status --- |
209 A file1 |
218 A file1 |
210 C file2 |
219 C file2 |
211 C file3 |
220 C file3 |
|
221 --- resolve --list --- |
212 --- file1 --- |
222 --- file1 --- |
213 1 |
223 1 |
214 changed |
224 changed |
215 --- file2 --- |
225 --- file2 --- |
216 2 |
226 2 |