equal
deleted
inserted
replaced
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 ---" |
14 > echo "--- resolve --list ---" |
15 > hg resolve --list file1 file2 file3 |
15 > hg resolve --list file1 file2 file3 |
|
16 > echo "--- debugmergestate ---" |
|
17 > hg debugmergestate |
16 > for file in file1 file2 file3; do |
18 > for file in file1 file2 file3; do |
17 > if [ -f $file ]; then |
19 > if [ -f $file ]; then |
18 > echo "--- $file ---" |
20 > echo "--- $file ---" |
19 > cat $file |
21 > cat $file |
20 > else |
22 > else |
66 M file2 |
68 M file2 |
67 M file3 |
69 M file3 |
68 C file1 |
70 C file1 |
69 --- resolve --list --- |
71 --- resolve --list --- |
70 U file3 |
72 U file3 |
|
73 --- debugmergestate --- |
|
74 * version 2 records |
|
75 local: 13910f48cf7bdb2a0ba6e24b4900e4fdd5739dd4 |
|
76 other: 10f9a0a634e82080907e62f075ab119cbc565ea6 |
|
77 file: file3 (record type "F", state "u", hash d5b0a58bc47161b1b8a831084b366f757c4f0b11) |
|
78 local path: file3 (flags "") |
|
79 ancestor path: file3 (node 2661d26c649684b482d10f91960cc3db683c38b4) |
|
80 other path: file3 (node a2644c43e210356772c7772a8674544a62e06beb) |
71 --- file1 --- |
81 --- file1 --- |
72 1 |
82 1 |
73 changed |
83 changed |
74 --- file2 --- |
84 --- file2 --- |
75 2 |
85 2 |
107 file2: * (glob) |
117 file2: * (glob) |
108 M file3 |
118 M file3 |
109 C file1 |
119 C file1 |
110 --- resolve --list --- |
120 --- resolve --list --- |
111 U file3 |
121 U file3 |
|
122 --- debugmergestate --- |
|
123 * version 2 records |
|
124 local: 13910f48cf7bdb2a0ba6e24b4900e4fdd5739dd4 |
|
125 other: 10f9a0a634e82080907e62f075ab119cbc565ea6 |
|
126 file: file3 (record type "F", state "u", hash d5b0a58bc47161b1b8a831084b366f757c4f0b11) |
|
127 local path: file3 (flags "") |
|
128 ancestor path: file3 (node 2661d26c649684b482d10f91960cc3db683c38b4) |
|
129 other path: file3 (node a2644c43e210356772c7772a8674544a62e06beb) |
112 --- file1 --- |
130 --- file1 --- |
113 1 |
131 1 |
114 changed |
132 changed |
115 *** file2 does not exist |
133 *** file2 does not exist |
116 --- file3 --- |
134 --- file3 --- |
158 M file2 |
176 M file2 |
159 M file3 |
177 M file3 |
160 R file1 |
178 R file1 |
161 --- resolve --list --- |
179 --- resolve --list --- |
162 U file3 |
180 U file3 |
|
181 --- debugmergestate --- |
|
182 * version 2 records |
|
183 local: 13910f48cf7bdb2a0ba6e24b4900e4fdd5739dd4 |
|
184 other: 10f9a0a634e82080907e62f075ab119cbc565ea6 |
|
185 file: file3 (record type "F", state "u", hash d5b0a58bc47161b1b8a831084b366f757c4f0b11) |
|
186 local path: file3 (flags "") |
|
187 ancestor path: file3 (node 2661d26c649684b482d10f91960cc3db683c38b4) |
|
188 other path: file3 (node a2644c43e210356772c7772a8674544a62e06beb) |
163 *** file1 does not exist |
189 *** file1 does not exist |
164 --- file2 --- |
190 --- file2 --- |
165 2 |
191 2 |
166 changed |
192 changed |
167 --- file3 --- |
193 --- file3 --- |
191 --- status --- |
217 --- status --- |
192 file2: * (glob) |
218 file2: * (glob) |
193 C file1 |
219 C file1 |
194 C file3 |
220 C file3 |
195 --- resolve --list --- |
221 --- resolve --list --- |
|
222 --- debugmergestate --- |
|
223 no merge state found |
196 --- file1 --- |
224 --- file1 --- |
197 1 |
225 1 |
198 changed |
226 changed |
199 *** file2 does not exist |
227 *** file2 does not exist |
200 --- file3 --- |
228 --- file3 --- |
217 --- status --- |
245 --- status --- |
218 A file1 |
246 A file1 |
219 C file2 |
247 C file2 |
220 C file3 |
248 C file3 |
221 --- resolve --list --- |
249 --- resolve --list --- |
|
250 --- debugmergestate --- |
|
251 no merge state found |
222 --- file1 --- |
252 --- file1 --- |
223 1 |
253 1 |
224 changed |
254 changed |
225 --- file2 --- |
255 --- file2 --- |
226 2 |
256 2 |