Mercurial > hg > mercurial-crew-with-dirclash
comparison tests/test-rename-merge2.out @ 3317:966632304dde
merge: shortcircuit filemerge for identical files
- use filectx.cmp to compare files
- move merge messages into filemerge
- kill the redundant resolving message
- update tests
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Tue, 10 Oct 2006 01:16:06 -0500 |
parents | ecc1bf27378c |
children | b16456909a0a |
comparison
equal
deleted
inserted
replaced
3316:0e370798eebf | 3317:966632304dde |
---|---|
4 resolving manifests | 4 resolving manifests |
5 overwrite None branchmerge True partial False | 5 overwrite None branchmerge True partial False |
6 ancestor e300d1c794ec local 735846fee2d7 remote 924404dff337 | 6 ancestor e300d1c794ec local 735846fee2d7 remote 924404dff337 |
7 rev: versions differ -> m | 7 rev: versions differ -> m |
8 a: remote copied -> m | 8 a: remote copied -> m |
9 merging a and b to b | 9 merging a and b |
10 resolving a | |
11 my a@. other b@735846fee2d7 ancestor a@924404dff337 | 10 my a@. other b@735846fee2d7 ancestor a@924404dff337 |
12 copying a to b | 11 copying a to b |
13 merging rev | 12 merging rev |
14 resolving rev | |
15 my rev@. other rev@735846fee2d7 ancestor rev@924404dff337 | 13 my rev@. other rev@735846fee2d7 ancestor rev@924404dff337 |
16 0 files updated, 2 files merged, 0 files removed, 0 files unresolved | 14 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
17 (branch merge, don't forget to commit) | 15 (branch merge, don't forget to commit) |
18 -------------- | 16 -------------- |
19 M a | 17 M a |
29 ancestor ac809aeed39a local f4db7e329e71 remote 924404dff337 | 27 ancestor ac809aeed39a local f4db7e329e71 remote 924404dff337 |
30 a: remote is newer -> g | 28 a: remote is newer -> g |
31 b: local copied -> m | 29 b: local copied -> m |
32 rev: versions differ -> m | 30 rev: versions differ -> m |
33 getting a | 31 getting a |
34 merging b and a to b | 32 merging b and a |
35 resolving b | |
36 my b@. other a@f4db7e329e71 ancestor a@924404dff337 | 33 my b@. other a@f4db7e329e71 ancestor a@924404dff337 |
37 merging rev | 34 merging rev |
38 resolving rev | |
39 my rev@. other rev@f4db7e329e71 ancestor rev@924404dff337 | 35 my rev@. other rev@f4db7e329e71 ancestor rev@924404dff337 |
40 1 files updated, 2 files merged, 0 files removed, 0 files unresolved | 36 1 files updated, 2 files merged, 0 files removed, 0 files unresolved |
41 (branch merge, don't forget to commit) | 37 (branch merge, don't forget to commit) |
42 -------------- | 38 -------------- |
43 M a | 39 M a |
51 resolving manifests | 47 resolving manifests |
52 overwrite None branchmerge True partial False | 48 overwrite None branchmerge True partial False |
53 ancestor e300d1c794ec local e03727d2d66b remote 924404dff337 | 49 ancestor e300d1c794ec local e03727d2d66b remote 924404dff337 |
54 a: remote moved -> m | 50 a: remote moved -> m |
55 rev: versions differ -> m | 51 rev: versions differ -> m |
56 merging a and b to b | 52 merging a and b |
57 resolving a | |
58 my a@. other b@e03727d2d66b ancestor a@924404dff337 | 53 my a@. other b@e03727d2d66b ancestor a@924404dff337 |
59 copying a to b | 54 copying a to b |
60 removing a | 55 removing a |
61 merging rev | 56 merging rev |
62 resolving rev | |
63 my rev@. other rev@e03727d2d66b ancestor rev@924404dff337 | 57 my rev@. other rev@e03727d2d66b ancestor rev@924404dff337 |
64 0 files updated, 2 files merged, 0 files removed, 0 files unresolved | 58 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
65 (branch merge, don't forget to commit) | 59 (branch merge, don't forget to commit) |
66 -------------- | 60 -------------- |
67 M b | 61 M b |
74 resolving manifests | 68 resolving manifests |
75 overwrite None branchmerge True partial False | 69 overwrite None branchmerge True partial False |
76 ancestor ecf3cb2a4219 local f4db7e329e71 remote 924404dff337 | 70 ancestor ecf3cb2a4219 local f4db7e329e71 remote 924404dff337 |
77 b: local moved -> m | 71 b: local moved -> m |
78 rev: versions differ -> m | 72 rev: versions differ -> m |
79 merging b and a to b | 73 merging b and a |
80 resolving b | |
81 my b@. other a@f4db7e329e71 ancestor a@924404dff337 | 74 my b@. other a@f4db7e329e71 ancestor a@924404dff337 |
82 merging rev | 75 merging rev |
83 resolving rev | |
84 my rev@. other rev@f4db7e329e71 ancestor rev@924404dff337 | 76 my rev@. other rev@f4db7e329e71 ancestor rev@924404dff337 |
85 0 files updated, 2 files merged, 0 files removed, 0 files unresolved | 77 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
86 (branch merge, don't forget to commit) | 78 (branch merge, don't forget to commit) |
87 -------------- | 79 -------------- |
88 M b | 80 M b |
95 resolving manifests | 87 resolving manifests |
96 overwrite None branchmerge True partial False | 88 overwrite None branchmerge True partial False |
97 ancestor 94b33a1b7f2d local 735846fee2d7 remote 924404dff337 | 89 ancestor 94b33a1b7f2d local 735846fee2d7 remote 924404dff337 |
98 rev: versions differ -> m | 90 rev: versions differ -> m |
99 a: remote copied -> m | 91 a: remote copied -> m |
100 merging a and b to b | |
101 resolving a | |
102 my a@. other b@735846fee2d7 ancestor a@924404dff337 | |
103 copying a to b | 92 copying a to b |
104 merging rev | 93 merging rev |
105 resolving rev | |
106 my rev@. other rev@735846fee2d7 ancestor rev@924404dff337 | 94 my rev@. other rev@735846fee2d7 ancestor rev@924404dff337 |
107 0 files updated, 2 files merged, 0 files removed, 0 files unresolved | 95 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
108 (branch merge, don't forget to commit) | 96 (branch merge, don't forget to commit) |
109 -------------- | 97 -------------- |
110 M a | 98 M b |
111 M b | 99 a |
112 a | 100 C a |
113 -------------- | 101 -------------- |
114 | 102 |
115 -------------- | 103 -------------- |
116 test L:nc a b R: W: - 6 nothing | 104 test L:nc a b R: W: - 6 nothing |
117 -------------- | 105 -------------- |
118 resolving manifests | 106 resolving manifests |
119 overwrite None branchmerge True partial False | 107 overwrite None branchmerge True partial False |
120 ancestor ac809aeed39a local 97c705ade336 remote 924404dff337 | 108 ancestor ac809aeed39a local 97c705ade336 remote 924404dff337 |
121 b: local copied -> m | 109 b: local copied -> m |
122 rev: versions differ -> m | 110 rev: versions differ -> m |
123 merging b and a to b | 111 merging rev |
124 resolving b | |
125 my b@. other a@97c705ade336 ancestor a@924404dff337 | |
126 merging rev | |
127 resolving rev | |
128 my rev@. other rev@97c705ade336 ancestor rev@924404dff337 | 112 my rev@. other rev@97c705ade336 ancestor rev@924404dff337 |
129 0 files updated, 2 files merged, 0 files removed, 0 files unresolved | 113 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
130 (branch merge, don't forget to commit) | 114 (branch merge, don't forget to commit) |
131 -------------- | 115 -------------- |
132 M b | 116 M b |
140 resolving manifests | 124 resolving manifests |
141 overwrite None branchmerge True partial False | 125 overwrite None branchmerge True partial False |
142 ancestor 94b33a1b7f2d local e03727d2d66b remote 924404dff337 | 126 ancestor 94b33a1b7f2d local e03727d2d66b remote 924404dff337 |
143 a: remote moved -> m | 127 a: remote moved -> m |
144 rev: versions differ -> m | 128 rev: versions differ -> m |
145 merging a and b to b | |
146 resolving a | |
147 my a@. other b@e03727d2d66b ancestor a@924404dff337 | |
148 copying a to b | 129 copying a to b |
149 removing a | 130 removing a |
150 merging rev | 131 merging rev |
151 resolving rev | |
152 my rev@. other rev@e03727d2d66b ancestor rev@924404dff337 | 132 my rev@. other rev@e03727d2d66b ancestor rev@924404dff337 |
153 0 files updated, 2 files merged, 0 files removed, 0 files unresolved | 133 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
154 (branch merge, don't forget to commit) | 134 (branch merge, don't forget to commit) |
155 -------------- | 135 -------------- |
156 M b | 136 M b |
163 resolving manifests | 143 resolving manifests |
164 overwrite None branchmerge True partial False | 144 overwrite None branchmerge True partial False |
165 ancestor ecf3cb2a4219 local 97c705ade336 remote 924404dff337 | 145 ancestor ecf3cb2a4219 local 97c705ade336 remote 924404dff337 |
166 b: local moved -> m | 146 b: local moved -> m |
167 rev: versions differ -> m | 147 rev: versions differ -> m |
168 merging b and a to b | 148 merging rev |
169 resolving b | |
170 my b@. other a@97c705ade336 ancestor a@924404dff337 | |
171 merging rev | |
172 resolving rev | |
173 my rev@. other rev@97c705ade336 ancestor rev@924404dff337 | 149 my rev@. other rev@97c705ade336 ancestor rev@924404dff337 |
174 0 files updated, 2 files merged, 0 files removed, 0 files unresolved | 150 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
175 (branch merge, don't forget to commit) | 151 (branch merge, don't forget to commit) |
176 -------------- | 152 -------------- |
177 M b | 153 M b |
185 overwrite None branchmerge True partial False | 161 overwrite None branchmerge True partial False |
186 ancestor ec03c2ca8642 local 79cc6877a3b7 remote 924404dff337 | 162 ancestor ec03c2ca8642 local 79cc6877a3b7 remote 924404dff337 |
187 b: versions differ -> m | 163 b: versions differ -> m |
188 rev: versions differ -> m | 164 rev: versions differ -> m |
189 merging b | 165 merging b |
190 resolving b | |
191 my b@. other b@79cc6877a3b7 ancestor a@924404dff337 | 166 my b@. other b@79cc6877a3b7 ancestor a@924404dff337 |
192 merging rev | 167 merging rev |
193 resolving rev | |
194 my rev@. other rev@79cc6877a3b7 ancestor rev@924404dff337 | 168 my rev@. other rev@79cc6877a3b7 ancestor rev@924404dff337 |
195 0 files updated, 2 files merged, 0 files removed, 0 files unresolved | 169 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
196 (branch merge, don't forget to commit) | 170 (branch merge, don't forget to commit) |
197 -------------- | 171 -------------- |
198 M b | 172 M b |
206 ancestor ecf3cb2a4219 local e6abcc1a30c2 remote 924404dff337 | 180 ancestor ecf3cb2a4219 local e6abcc1a30c2 remote 924404dff337 |
207 rev: versions differ -> m | 181 rev: versions differ -> m |
208 c: remote created -> g | 182 c: remote created -> g |
209 getting c | 183 getting c |
210 merging rev | 184 merging rev |
211 resolving rev | |
212 my rev@. other rev@e6abcc1a30c2 ancestor rev@924404dff337 | 185 my rev@. other rev@e6abcc1a30c2 ancestor rev@924404dff337 |
213 1 files updated, 1 files merged, 0 files removed, 0 files unresolved | 186 1 files updated, 1 files merged, 0 files removed, 0 files unresolved |
214 (branch merge, don't forget to commit) | 187 (branch merge, don't forget to commit) |
215 -------------- | 188 -------------- |
216 M c | 189 M c |
224 overwrite None branchmerge True partial False | 197 overwrite None branchmerge True partial False |
225 ancestor ac809aeed39a local af30c7647fc7 remote 924404dff337 | 198 ancestor ac809aeed39a local af30c7647fc7 remote 924404dff337 |
226 b: versions differ -> m | 199 b: versions differ -> m |
227 rev: versions differ -> m | 200 rev: versions differ -> m |
228 merging b | 201 merging b |
229 resolving b | |
230 my b@. other b@af30c7647fc7 ancestor b@000000000000 | 202 my b@. other b@af30c7647fc7 ancestor b@000000000000 |
231 merging rev | 203 merging rev |
232 resolving rev | |
233 my rev@. other rev@af30c7647fc7 ancestor rev@924404dff337 | 204 my rev@. other rev@af30c7647fc7 ancestor rev@924404dff337 |
234 0 files updated, 2 files merged, 0 files removed, 0 files unresolved | 205 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
235 (branch merge, don't forget to commit) | 206 (branch merge, don't forget to commit) |
236 -------------- | 207 -------------- |
237 M b | 208 M b |
247 a: other deleted -> r | 218 a: other deleted -> r |
248 b: versions differ -> m | 219 b: versions differ -> m |
249 rev: versions differ -> m | 220 rev: versions differ -> m |
250 removing a | 221 removing a |
251 merging b | 222 merging b |
252 resolving b | |
253 my b@. other b@e03727d2d66b ancestor b@000000000000 | 223 my b@. other b@e03727d2d66b ancestor b@000000000000 |
254 merging rev | 224 merging rev |
255 resolving rev | |
256 my rev@. other rev@e03727d2d66b ancestor rev@924404dff337 | 225 my rev@. other rev@e03727d2d66b ancestor rev@924404dff337 |
257 0 files updated, 2 files merged, 1 files removed, 0 files unresolved | 226 0 files updated, 2 files merged, 1 files removed, 0 files unresolved |
258 (branch merge, don't forget to commit) | 227 (branch merge, don't forget to commit) |
259 -------------- | 228 -------------- |
260 M b | 229 M b |
269 a: remote is newer -> g | 238 a: remote is newer -> g |
270 b: versions differ -> m | 239 b: versions differ -> m |
271 rev: versions differ -> m | 240 rev: versions differ -> m |
272 getting a | 241 getting a |
273 merging b | 242 merging b |
274 resolving b | |
275 my b@. other b@8dbce441892a ancestor b@000000000000 | 243 my b@. other b@8dbce441892a ancestor b@000000000000 |
276 merging rev | 244 merging rev |
277 resolving rev | |
278 my rev@. other rev@8dbce441892a ancestor rev@924404dff337 | 245 my rev@. other rev@8dbce441892a ancestor rev@924404dff337 |
279 1 files updated, 2 files merged, 0 files removed, 0 files unresolved | 246 1 files updated, 2 files merged, 0 files removed, 0 files unresolved |
280 (branch merge, don't forget to commit) | 247 (branch merge, don't forget to commit) |
281 -------------- | 248 -------------- |
282 M a | 249 M a |
292 a: other deleted -> r | 259 a: other deleted -> r |
293 b: versions differ -> m | 260 b: versions differ -> m |
294 rev: versions differ -> m | 261 rev: versions differ -> m |
295 removing a | 262 removing a |
296 merging b | 263 merging b |
297 resolving b | |
298 my b@. other b@e03727d2d66b ancestor b@000000000000 | 264 my b@. other b@e03727d2d66b ancestor b@000000000000 |
299 merging rev | 265 merging rev |
300 resolving rev | |
301 my rev@. other rev@e03727d2d66b ancestor rev@924404dff337 | 266 my rev@. other rev@e03727d2d66b ancestor rev@924404dff337 |
302 0 files updated, 2 files merged, 1 files removed, 0 files unresolved | 267 0 files updated, 2 files merged, 1 files removed, 0 files unresolved |
303 (branch merge, don't forget to commit) | 268 (branch merge, don't forget to commit) |
304 -------------- | 269 -------------- |
305 M b | 270 M b |
314 a: remote is newer -> g | 279 a: remote is newer -> g |
315 b: versions differ -> m | 280 b: versions differ -> m |
316 rev: versions differ -> m | 281 rev: versions differ -> m |
317 getting a | 282 getting a |
318 merging b | 283 merging b |
319 resolving b | |
320 my b@. other b@8dbce441892a ancestor b@000000000000 | 284 my b@. other b@8dbce441892a ancestor b@000000000000 |
321 merging rev | 285 merging rev |
322 resolving rev | |
323 my rev@. other rev@8dbce441892a ancestor rev@924404dff337 | 286 my rev@. other rev@8dbce441892a ancestor rev@924404dff337 |
324 1 files updated, 2 files merged, 0 files removed, 0 files unresolved | 287 1 files updated, 2 files merged, 0 files removed, 0 files unresolved |
325 (branch merge, don't forget to commit) | 288 (branch merge, don't forget to commit) |
326 -------------- | 289 -------------- |
327 M a | 290 M a |
335 overwrite None branchmerge True partial False | 298 overwrite None branchmerge True partial False |
336 ancestor 0b76e65c8289 local 735846fee2d7 remote 924404dff337 | 299 ancestor 0b76e65c8289 local 735846fee2d7 remote 924404dff337 |
337 b: versions differ -> m | 300 b: versions differ -> m |
338 rev: versions differ -> m | 301 rev: versions differ -> m |
339 merging b | 302 merging b |
340 resolving b | |
341 my b@. other b@735846fee2d7 ancestor b@000000000000 | 303 my b@. other b@735846fee2d7 ancestor b@000000000000 |
342 merging rev | 304 merging rev |
343 resolving rev | |
344 my rev@. other rev@735846fee2d7 ancestor rev@924404dff337 | 305 my rev@. other rev@735846fee2d7 ancestor rev@924404dff337 |
345 0 files updated, 2 files merged, 0 files removed, 0 files unresolved | 306 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
346 (branch merge, don't forget to commit) | 307 (branch merge, don't forget to commit) |
347 -------------- | 308 -------------- |
348 M b | 309 M b |
358 b: versions differ -> m | 319 b: versions differ -> m |
359 rev: versions differ -> m | 320 rev: versions differ -> m |
360 a: prompt recreating -> g | 321 a: prompt recreating -> g |
361 getting a | 322 getting a |
362 merging b | 323 merging b |
363 resolving b | |
364 my b@. other b@8dbce441892a ancestor b@000000000000 | 324 my b@. other b@8dbce441892a ancestor b@000000000000 |
365 merging rev | 325 merging rev |
366 resolving rev | |
367 my rev@. other rev@8dbce441892a ancestor rev@924404dff337 | 326 my rev@. other rev@8dbce441892a ancestor rev@924404dff337 |
368 1 files updated, 2 files merged, 0 files removed, 0 files unresolved | 327 1 files updated, 2 files merged, 0 files removed, 0 files unresolved |
369 (branch merge, don't forget to commit) | 328 (branch merge, don't forget to commit) |
370 -------------- | 329 -------------- |
371 M a | 330 M a |
379 overwrite None branchmerge True partial False | 338 overwrite None branchmerge True partial False |
380 ancestor 0b76e65c8289 local e03727d2d66b remote 924404dff337 | 339 ancestor 0b76e65c8289 local e03727d2d66b remote 924404dff337 |
381 b: versions differ -> m | 340 b: versions differ -> m |
382 rev: versions differ -> m | 341 rev: versions differ -> m |
383 merging b | 342 merging b |
384 resolving b | |
385 my b@. other b@e03727d2d66b ancestor b@000000000000 | 343 my b@. other b@e03727d2d66b ancestor b@000000000000 |
386 merging rev | 344 merging rev |
387 resolving rev | |
388 my rev@. other rev@e03727d2d66b ancestor rev@924404dff337 | 345 my rev@. other rev@e03727d2d66b ancestor rev@924404dff337 |
389 0 files updated, 2 files merged, 0 files removed, 0 files unresolved | 346 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
390 (branch merge, don't forget to commit) | 347 (branch merge, don't forget to commit) |
391 -------------- | 348 -------------- |
392 M b | 349 M b |
399 resolving manifests | 356 resolving manifests |
400 overwrite None branchmerge True partial False | 357 overwrite None branchmerge True partial False |
401 ancestor e300d1c794ec local 79cc6877a3b7 remote 924404dff337 | 358 ancestor e300d1c794ec local 79cc6877a3b7 remote 924404dff337 |
402 a: remote moved -> m | 359 a: remote moved -> m |
403 rev: versions differ -> m | 360 rev: versions differ -> m |
404 merging a and b to b | 361 merging a and b |
405 resolving a | |
406 my a@. other b@79cc6877a3b7 ancestor a@924404dff337 | 362 my a@. other b@79cc6877a3b7 ancestor a@924404dff337 |
407 copying a to b | 363 copying a to b |
408 removing a | 364 removing a |
409 merging rev | 365 merging rev |
410 resolving rev | |
411 my rev@. other rev@79cc6877a3b7 ancestor rev@924404dff337 | 366 my rev@. other rev@79cc6877a3b7 ancestor rev@924404dff337 |
412 0 files updated, 2 files merged, 0 files removed, 0 files unresolved | 367 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
413 (branch merge, don't forget to commit) | 368 (branch merge, don't forget to commit) |
414 -------------- | 369 -------------- |
415 M b | 370 M b |
422 resolving manifests | 377 resolving manifests |
423 overwrite None branchmerge True partial False | 378 overwrite None branchmerge True partial False |
424 ancestor ec03c2ca8642 local f4db7e329e71 remote 924404dff337 | 379 ancestor ec03c2ca8642 local f4db7e329e71 remote 924404dff337 |
425 b: local moved -> m | 380 b: local moved -> m |
426 rev: versions differ -> m | 381 rev: versions differ -> m |
427 merging b and a to b | 382 merging b and a |
428 resolving b | |
429 my b@. other a@f4db7e329e71 ancestor a@924404dff337 | 383 my b@. other a@f4db7e329e71 ancestor a@924404dff337 |
430 merging rev | 384 merging rev |
431 resolving rev | |
432 my rev@. other rev@f4db7e329e71 ancestor rev@924404dff337 | 385 my rev@. other rev@f4db7e329e71 ancestor rev@924404dff337 |
433 0 files updated, 2 files merged, 0 files removed, 0 files unresolved | 386 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
434 (branch merge, don't forget to commit) | 387 (branch merge, don't forget to commit) |
435 -------------- | 388 -------------- |
436 M b | 389 M b |
444 overwrite None branchmerge True partial False | 397 overwrite None branchmerge True partial False |
445 ancestor ecf3cb2a4219 local 2b958612230f remote 924404dff337 | 398 ancestor ecf3cb2a4219 local 2b958612230f remote 924404dff337 |
446 b: local moved -> m | 399 b: local moved -> m |
447 rev: versions differ -> m | 400 rev: versions differ -> m |
448 c: remote created -> g | 401 c: remote created -> g |
449 merging b and a to b | 402 merging b and a |
450 resolving b | |
451 my b@. other a@2b958612230f ancestor a@924404dff337 | 403 my b@. other a@2b958612230f ancestor a@924404dff337 |
452 getting c | 404 getting c |
453 merging rev | 405 merging rev |
454 resolving rev | |
455 my rev@. other rev@2b958612230f ancestor rev@924404dff337 | 406 my rev@. other rev@2b958612230f ancestor rev@924404dff337 |
456 1 files updated, 2 files merged, 0 files removed, 0 files unresolved | 407 1 files updated, 2 files merged, 0 files removed, 0 files unresolved |
457 (branch merge, don't forget to commit) | 408 (branch merge, don't forget to commit) |
458 -------------- | 409 -------------- |
459 M b | 410 M b |