Mercurial > hg

comparison tests/test-rename-merge2.t @ 26611:a5ff66e6d77a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
filemerge: break overall filemerge into separate premerge and merge steps This means that in ms.resolve we must call merge after calling premerge. This doesn't yet mean that all premerges happen before any merges -- however, this does get us closer to our goal. The output differences are because we recompute the merge tool. The only user-visible difference caused by this patch is that if the tool is missing we'll print the warning twice. Not a huge deal, though.
author Siddharth Agarwal <sid0@fb.com>
date Sun, 11 Oct 2015 20:47:14 -0700
parents bd625cd4e5e7
children 8e6d5b7317e6
comparison
equal deleted inserted replaced
26610:f9f82c444ff7 26611:a5ff66e6d77a
96 premerge successful 96 premerge successful
97 rev: versions differ -> m 97 rev: versions differ -> m
98 picked tool 'python ../merge' for rev (binary False symlink False) 98 picked tool 'python ../merge' for rev (binary False symlink False)
99 merging rev 99 merging rev
100 my rev@e300d1c794ec+ other rev@4ce40f5aca24 ancestor rev@924404dff337 100 my rev@e300d1c794ec+ other rev@4ce40f5aca24 ancestor rev@924404dff337
101 picked tool 'python ../merge' for rev (binary False symlink False)
102 my rev@e300d1c794ec+ other rev@4ce40f5aca24 ancestor rev@924404dff337
101 launching merge tool: python ../merge *$TESTTMP/t/t/rev* * * (glob) 103 launching merge tool: python ../merge *$TESTTMP/t/t/rev* * * (glob)
102 merge tool returned: 0 104 merge tool returned: 0
103 0 files updated, 2 files merged, 0 files removed, 0 files unresolved 105 0 files updated, 2 files merged, 0 files removed, 0 files unresolved
104 (branch merge, don't forget to commit) 106 (branch merge, don't forget to commit)
105 -------------- 107 --------------
133 premerge successful 135 premerge successful
134 rev: versions differ -> m 136 rev: versions differ -> m
135 picked tool 'python ../merge' for rev (binary False symlink False) 137 picked tool 'python ../merge' for rev (binary False symlink False)
136 merging rev 138 merging rev
137 my rev@86a2aa42fc76+ other rev@f4db7e329e71 ancestor rev@924404dff337 139 my rev@86a2aa42fc76+ other rev@f4db7e329e71 ancestor rev@924404dff337
138 launching merge tool: python ../merge *$TESTTMP/t/t/rev* * (glob) 140 picked tool 'python ../merge' for rev (binary False symlink False)
141 my rev@86a2aa42fc76+ other rev@f4db7e329e71 ancestor rev@924404dff337
142 launching merge tool: python ../merge *$TESTTMP/t/t/rev* * * (glob)
139 merge tool returned: 0 143 merge tool returned: 0
140 1 files updated, 2 files merged, 0 files removed, 0 files unresolved 144 1 files updated, 2 files merged, 0 files removed, 0 files unresolved
141 (branch merge, don't forget to commit) 145 (branch merge, don't forget to commit)
142 -------------- 146 --------------
143 M a 147 M a
169 premerge successful 173 premerge successful
170 rev: versions differ -> m 174 rev: versions differ -> m
171 picked tool 'python ../merge' for rev (binary False symlink False) 175 picked tool 'python ../merge' for rev (binary False symlink False)
172 merging rev 176 merging rev
173 my rev@e300d1c794ec+ other rev@bdb19105162a ancestor rev@924404dff337 177 my rev@e300d1c794ec+ other rev@bdb19105162a ancestor rev@924404dff337
178 picked tool 'python ../merge' for rev (binary False symlink False)
179 my rev@e300d1c794ec+ other rev@bdb19105162a ancestor rev@924404dff337
174 launching merge tool: python ../merge *$TESTTMP/t/t/rev* * * (glob) 180 launching merge tool: python ../merge *$TESTTMP/t/t/rev* * * (glob)
175 merge tool returned: 0 181 merge tool returned: 0
176 0 files updated, 2 files merged, 0 files removed, 0 files unresolved 182 0 files updated, 2 files merged, 0 files removed, 0 files unresolved
177 (branch merge, don't forget to commit) 183 (branch merge, don't forget to commit)
178 -------------- 184 --------------
203 premerge successful 209 premerge successful
204 rev: versions differ -> m 210 rev: versions differ -> m
205 picked tool 'python ../merge' for rev (binary False symlink False) 211 picked tool 'python ../merge' for rev (binary False symlink False)
206 merging rev 212 merging rev
207 my rev@02963e448370+ other rev@f4db7e329e71 ancestor rev@924404dff337 213 my rev@02963e448370+ other rev@f4db7e329e71 ancestor rev@924404dff337
214 picked tool 'python ../merge' for rev (binary False symlink False)
215 my rev@02963e448370+ other rev@f4db7e329e71 ancestor rev@924404dff337
208 launching merge tool: python ../merge *$TESTTMP/t/t/rev* * * (glob) 216 launching merge tool: python ../merge *$TESTTMP/t/t/rev* * * (glob)
209 merge tool returned: 0 217 merge tool returned: 0
210 0 files updated, 2 files merged, 0 files removed, 0 files unresolved 218 0 files updated, 2 files merged, 0 files removed, 0 files unresolved
211 (branch merge, don't forget to commit) 219 (branch merge, don't forget to commit)
212 -------------- 220 --------------
233 getting b 241 getting b
234 rev: versions differ -> m 242 rev: versions differ -> m
235 picked tool 'python ../merge' for rev (binary False symlink False) 243 picked tool 'python ../merge' for rev (binary False symlink False)
236 merging rev 244 merging rev
237 my rev@94b33a1b7f2d+ other rev@4ce40f5aca24 ancestor rev@924404dff337 245 my rev@94b33a1b7f2d+ other rev@4ce40f5aca24 ancestor rev@924404dff337
246 picked tool 'python ../merge' for rev (binary False symlink False)
247 my rev@94b33a1b7f2d+ other rev@4ce40f5aca24 ancestor rev@924404dff337
238 launching merge tool: python ../merge *$TESTTMP/t/t/rev* * * (glob) 248 launching merge tool: python ../merge *$TESTTMP/t/t/rev* * * (glob)
239 merge tool returned: 0 249 merge tool returned: 0
240 1 files updated, 1 files merged, 0 files removed, 0 files unresolved 250 1 files updated, 1 files merged, 0 files removed, 0 files unresolved
241 (branch merge, don't forget to commit) 251 (branch merge, don't forget to commit)
242 -------------- 252 --------------
260 ancestor: 924404dff337, local: 86a2aa42fc76+, remote: 97c705ade336 270 ancestor: 924404dff337, local: 86a2aa42fc76+, remote: 97c705ade336
261 preserving rev for resolve of rev 271 preserving rev for resolve of rev
262 rev: versions differ -> m 272 rev: versions differ -> m
263 picked tool 'python ../merge' for rev (binary False symlink False) 273 picked tool 'python ../merge' for rev (binary False symlink False)
264 merging rev 274 merging rev
275 my rev@86a2aa42fc76+ other rev@97c705ade336 ancestor rev@924404dff337
276 picked tool 'python ../merge' for rev (binary False symlink False)
265 my rev@86a2aa42fc76+ other rev@97c705ade336 ancestor rev@924404dff337 277 my rev@86a2aa42fc76+ other rev@97c705ade336 ancestor rev@924404dff337
266 launching merge tool: python ../merge *$TESTTMP/t/t/rev* * * (glob) 278 launching merge tool: python ../merge *$TESTTMP/t/t/rev* * * (glob)
267 merge tool returned: 0 279 merge tool returned: 0
268 0 files updated, 1 files merged, 0 files removed, 0 files unresolved 280 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
269 (branch merge, don't forget to commit) 281 (branch merge, don't forget to commit)
293 getting b 305 getting b
294 rev: versions differ -> m 306 rev: versions differ -> m
295 picked tool 'python ../merge' for rev (binary False symlink False) 307 picked tool 'python ../merge' for rev (binary False symlink False)
296 merging rev 308 merging rev
297 my rev@94b33a1b7f2d+ other rev@bdb19105162a ancestor rev@924404dff337 309 my rev@94b33a1b7f2d+ other rev@bdb19105162a ancestor rev@924404dff337
310 picked tool 'python ../merge' for rev (binary False symlink False)
311 my rev@94b33a1b7f2d+ other rev@bdb19105162a ancestor rev@924404dff337
298 launching merge tool: python ../merge *$TESTTMP/t/t/rev* * * (glob) 312 launching merge tool: python ../merge *$TESTTMP/t/t/rev* * * (glob)
299 merge tool returned: 0 313 merge tool returned: 0
300 1 files updated, 1 files merged, 1 files removed, 0 files unresolved 314 1 files updated, 1 files merged, 1 files removed, 0 files unresolved
301 (branch merge, don't forget to commit) 315 (branch merge, don't forget to commit)
302 -------------- 316 --------------
319 ancestor: 924404dff337, local: 02963e448370+, remote: 97c705ade336 333 ancestor: 924404dff337, local: 02963e448370+, remote: 97c705ade336
320 preserving rev for resolve of rev 334 preserving rev for resolve of rev
321 rev: versions differ -> m 335 rev: versions differ -> m
322 picked tool 'python ../merge' for rev (binary False symlink False) 336 picked tool 'python ../merge' for rev (binary False symlink False)
323 merging rev 337 merging rev
338 my rev@02963e448370+ other rev@97c705ade336 ancestor rev@924404dff337
339 picked tool 'python ../merge' for rev (binary False symlink False)
324 my rev@02963e448370+ other rev@97c705ade336 ancestor rev@924404dff337 340 my rev@02963e448370+ other rev@97c705ade336 ancestor rev@924404dff337
325 launching merge tool: python ../merge *$TESTTMP/t/t/rev* * * (glob) 341 launching merge tool: python ../merge *$TESTTMP/t/t/rev* * * (glob)
326 merge tool returned: 0 342 merge tool returned: 0
327 0 files updated, 1 files merged, 0 files removed, 0 files unresolved 343 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
328 (branch merge, don't forget to commit) 344 (branch merge, don't forget to commit)
345 preserving rev for resolve of rev 361 preserving rev for resolve of rev
346 b: both renamed from a -> m 362 b: both renamed from a -> m
347 picked tool 'python ../merge' for b (binary False symlink False) 363 picked tool 'python ../merge' for b (binary False symlink False)
348 merging b 364 merging b
349 my b@62e7bf090eba+ other b@49b6d8032493 ancestor a@924404dff337 365 my b@62e7bf090eba+ other b@49b6d8032493 ancestor a@924404dff337
366 picked tool 'python ../merge' for b (binary False symlink False)
367 my b@62e7bf090eba+ other b@49b6d8032493 ancestor a@924404dff337
350 launching merge tool: python ../merge *$TESTTMP/t/t/b* * * (glob) 368 launching merge tool: python ../merge *$TESTTMP/t/t/b* * * (glob)
351 merge tool returned: 0 369 merge tool returned: 0
352 rev: versions differ -> m 370 rev: versions differ -> m
353 picked tool 'python ../merge' for rev (binary False symlink False) 371 picked tool 'python ../merge' for rev (binary False symlink False)
354 merging rev 372 merging rev
373 my rev@62e7bf090eba+ other rev@49b6d8032493 ancestor rev@924404dff337
374 picked tool 'python ../merge' for rev (binary False symlink False)
355 my rev@62e7bf090eba+ other rev@49b6d8032493 ancestor rev@924404dff337 375 my rev@62e7bf090eba+ other rev@49b6d8032493 ancestor rev@924404dff337
356 launching merge tool: python ../merge *$TESTTMP/t/t/rev* * * (glob) 376 launching merge tool: python ../merge *$TESTTMP/t/t/rev* * * (glob)
357 merge tool returned: 0 377 merge tool returned: 0
358 0 files updated, 2 files merged, 0 files removed, 0 files unresolved 378 0 files updated, 2 files merged, 0 files removed, 0 files unresolved
359 (branch merge, don't forget to commit) 379 (branch merge, don't forget to commit)
385 c: remote created -> g 405 c: remote created -> g
386 getting c 406 getting c
387 rev: versions differ -> m 407 rev: versions differ -> m
388 picked tool 'python ../merge' for rev (binary False symlink False) 408 picked tool 'python ../merge' for rev (binary False symlink False)
389 merging rev 409 merging rev
410 my rev@02963e448370+ other rev@fe905ef2c33e ancestor rev@924404dff337
411 picked tool 'python ../merge' for rev (binary False symlink False)
390 my rev@02963e448370+ other rev@fe905ef2c33e ancestor rev@924404dff337 412 my rev@02963e448370+ other rev@fe905ef2c33e ancestor rev@924404dff337
391 launching merge tool: python ../merge *$TESTTMP/t/t/rev* * * (glob) 413 launching merge tool: python ../merge *$TESTTMP/t/t/rev* * * (glob)
392 merge tool returned: 0 414 merge tool returned: 0
393 note: possible conflict - a was renamed multiple times to: 415 note: possible conflict - a was renamed multiple times to:
394 b 416 b
415 preserving rev for resolve of rev 437 preserving rev for resolve of rev
416 b: both created -> m 438 b: both created -> m
417 picked tool 'python ../merge' for b (binary False symlink False) 439 picked tool 'python ../merge' for b (binary False symlink False)
418 merging b 440 merging b
419 my b@86a2aa42fc76+ other b@af30c7647fc7 ancestor b@000000000000 441 my b@86a2aa42fc76+ other b@af30c7647fc7 ancestor b@000000000000
442 picked tool 'python ../merge' for b (binary False symlink False)
443 my b@86a2aa42fc76+ other b@af30c7647fc7 ancestor b@000000000000
420 launching merge tool: python ../merge *$TESTTMP/t/t/b* * * (glob) 444 launching merge tool: python ../merge *$TESTTMP/t/t/b* * * (glob)
421 merge tool returned: 0 445 merge tool returned: 0
422 rev: versions differ -> m 446 rev: versions differ -> m
423 picked tool 'python ../merge' for rev (binary False symlink False) 447 picked tool 'python ../merge' for rev (binary False symlink False)
424 merging rev 448 merging rev
449 my rev@86a2aa42fc76+ other rev@af30c7647fc7 ancestor rev@924404dff337
450 picked tool 'python ../merge' for rev (binary False symlink False)
425 my rev@86a2aa42fc76+ other rev@af30c7647fc7 ancestor rev@924404dff337 451 my rev@86a2aa42fc76+ other rev@af30c7647fc7 ancestor rev@924404dff337
426 launching merge tool: python ../merge *$TESTTMP/t/t/rev* * * (glob) 452 launching merge tool: python ../merge *$TESTTMP/t/t/rev* * * (glob)
427 merge tool returned: 0 453 merge tool returned: 0
428 0 files updated, 2 files merged, 0 files removed, 0 files unresolved 454 0 files updated, 2 files merged, 0 files removed, 0 files unresolved
429 (branch merge, don't forget to commit) 455 (branch merge, don't forget to commit)
449 removing a 475 removing a
450 b: both created -> m 476 b: both created -> m
451 picked tool 'python ../merge' for b (binary False symlink False) 477 picked tool 'python ../merge' for b (binary False symlink False)
452 merging b 478 merging b
453 my b@59318016310c+ other b@bdb19105162a ancestor b@000000000000 479 my b@59318016310c+ other b@bdb19105162a ancestor b@000000000000
480 picked tool 'python ../merge' for b (binary False symlink False)
481 my b@59318016310c+ other b@bdb19105162a ancestor b@000000000000
454 launching merge tool: python ../merge *$TESTTMP/t/t/b* * * (glob) 482 launching merge tool: python ../merge *$TESTTMP/t/t/b* * * (glob)
455 merge tool returned: 0 483 merge tool returned: 0
456 rev: versions differ -> m 484 rev: versions differ -> m
457 picked tool 'python ../merge' for rev (binary False symlink False) 485 picked tool 'python ../merge' for rev (binary False symlink False)
458 merging rev 486 merging rev
487 my rev@59318016310c+ other rev@bdb19105162a ancestor rev@924404dff337
488 picked tool 'python ../merge' for rev (binary False symlink False)
459 my rev@59318016310c+ other rev@bdb19105162a ancestor rev@924404dff337 489 my rev@59318016310c+ other rev@bdb19105162a ancestor rev@924404dff337
460 launching merge tool: python ../merge *$TESTTMP/t/t/rev* * * (glob) 490 launching merge tool: python ../merge *$TESTTMP/t/t/rev* * * (glob)
461 merge tool returned: 0 491 merge tool returned: 0
462 0 files updated, 2 files merged, 1 files removed, 0 files unresolved 492 0 files updated, 2 files merged, 1 files removed, 0 files unresolved
463 (branch merge, don't forget to commit) 493 (branch merge, don't forget to commit)
482 getting a 512 getting a
483 b: both created -> m 513 b: both created -> m
484 picked tool 'python ../merge' for b (binary False symlink False) 514 picked tool 'python ../merge' for b (binary False symlink False)
485 merging b 515 merging b
486 my b@86a2aa42fc76+ other b@8dbce441892a ancestor b@000000000000 516 my b@86a2aa42fc76+ other b@8dbce441892a ancestor b@000000000000
517 picked tool 'python ../merge' for b (binary False symlink False)
518 my b@86a2aa42fc76+ other b@8dbce441892a ancestor b@000000000000
487 launching merge tool: python ../merge *$TESTTMP/t/t/b* * * (glob) 519 launching merge tool: python ../merge *$TESTTMP/t/t/b* * * (glob)
488 merge tool returned: 0 520 merge tool returned: 0
489 rev: versions differ -> m 521 rev: versions differ -> m
490 picked tool 'python ../merge' for rev (binary False symlink False) 522 picked tool 'python ../merge' for rev (binary False symlink False)
491 merging rev 523 merging rev
524 my rev@86a2aa42fc76+ other rev@8dbce441892a ancestor rev@924404dff337
525 picked tool 'python ../merge' for rev (binary False symlink False)
492 my rev@86a2aa42fc76+ other rev@8dbce441892a ancestor rev@924404dff337 526 my rev@86a2aa42fc76+ other rev@8dbce441892a ancestor rev@924404dff337
493 launching merge tool: python ../merge *$TESTTMP/t/t/rev* * * (glob) 527 launching merge tool: python ../merge *$TESTTMP/t/t/rev* * * (glob)
494 merge tool returned: 0 528 merge tool returned: 0
495 1 files updated, 2 files merged, 0 files removed, 0 files unresolved 529 1 files updated, 2 files merged, 0 files removed, 0 files unresolved
496 (branch merge, don't forget to commit) 530 (branch merge, don't forget to commit)
516 removing a 550 removing a
517 b: both created -> m 551 b: both created -> m
518 picked tool 'python ../merge' for b (binary False symlink False) 552 picked tool 'python ../merge' for b (binary False symlink False)
519 merging b 553 merging b
520 my b@59318016310c+ other b@bdb19105162a ancestor b@000000000000 554 my b@59318016310c+ other b@bdb19105162a ancestor b@000000000000
555 picked tool 'python ../merge' for b (binary False symlink False)
556 my b@59318016310c+ other b@bdb19105162a ancestor b@000000000000
521 launching merge tool: python ../merge *$TESTTMP/t/t/b* * * (glob) 557 launching merge tool: python ../merge *$TESTTMP/t/t/b* * * (glob)
522 merge tool returned: 0 558 merge tool returned: 0
523 rev: versions differ -> m 559 rev: versions differ -> m
524 picked tool 'python ../merge' for rev (binary False symlink False) 560 picked tool 'python ../merge' for rev (binary False symlink False)
525 merging rev 561 merging rev
562 my rev@59318016310c+ other rev@bdb19105162a ancestor rev@924404dff337
563 picked tool 'python ../merge' for rev (binary False symlink False)
526 my rev@59318016310c+ other rev@bdb19105162a ancestor rev@924404dff337 564 my rev@59318016310c+ other rev@bdb19105162a ancestor rev@924404dff337
527 launching merge tool: python ../merge *$TESTTMP/t/t/rev* * * (glob) 565 launching merge tool: python ../merge *$TESTTMP/t/t/rev* * * (glob)
528 merge tool returned: 0 566 merge tool returned: 0
529 0 files updated, 2 files merged, 1 files removed, 0 files unresolved 567 0 files updated, 2 files merged, 1 files removed, 0 files unresolved
530 (branch merge, don't forget to commit) 568 (branch merge, don't forget to commit)
549 getting a 587 getting a
550 b: both created -> m 588 b: both created -> m
551 picked tool 'python ../merge' for b (binary False symlink False) 589 picked tool 'python ../merge' for b (binary False symlink False)
552 merging b 590 merging b
553 my b@86a2aa42fc76+ other b@8dbce441892a ancestor b@000000000000 591 my b@86a2aa42fc76+ other b@8dbce441892a ancestor b@000000000000
592 picked tool 'python ../merge' for b (binary False symlink False)
593 my b@86a2aa42fc76+ other b@8dbce441892a ancestor b@000000000000
554 launching merge tool: python ../merge *$TESTTMP/t/t/b* * * (glob) 594 launching merge tool: python ../merge *$TESTTMP/t/t/b* * * (glob)
555 merge tool returned: 0 595 merge tool returned: 0
556 rev: versions differ -> m 596 rev: versions differ -> m
557 picked tool 'python ../merge' for rev (binary False symlink False) 597 picked tool 'python ../merge' for rev (binary False symlink False)
558 merging rev 598 merging rev
599 my rev@86a2aa42fc76+ other rev@8dbce441892a ancestor rev@924404dff337
600 picked tool 'python ../merge' for rev (binary False symlink False)
559 my rev@86a2aa42fc76+ other rev@8dbce441892a ancestor rev@924404dff337 601 my rev@86a2aa42fc76+ other rev@8dbce441892a ancestor rev@924404dff337
560 launching merge tool: python ../merge *$TESTTMP/t/t/rev* * * (glob) 602 launching merge tool: python ../merge *$TESTTMP/t/t/rev* * * (glob)
561 merge tool returned: 0 603 merge tool returned: 0
562 1 files updated, 2 files merged, 0 files removed, 0 files unresolved 604 1 files updated, 2 files merged, 0 files removed, 0 files unresolved
563 (branch merge, don't forget to commit) 605 (branch merge, don't forget to commit)
582 a: remote unchanged -> k 624 a: remote unchanged -> k
583 b: both created -> m 625 b: both created -> m
584 picked tool 'python ../merge' for b (binary False symlink False) 626 picked tool 'python ../merge' for b (binary False symlink False)
585 merging b 627 merging b
586 my b@0b76e65c8289+ other b@4ce40f5aca24 ancestor b@000000000000 628 my b@0b76e65c8289+ other b@4ce40f5aca24 ancestor b@000000000000
629 picked tool 'python ../merge' for b (binary False symlink False)
630 my b@0b76e65c8289+ other b@4ce40f5aca24 ancestor b@000000000000
587 launching merge tool: python ../merge *$TESTTMP/t/t/b* * * (glob) 631 launching merge tool: python ../merge *$TESTTMP/t/t/b* * * (glob)
588 merge tool returned: 0 632 merge tool returned: 0
589 rev: versions differ -> m 633 rev: versions differ -> m
590 picked tool 'python ../merge' for rev (binary False symlink False) 634 picked tool 'python ../merge' for rev (binary False symlink False)
591 merging rev 635 merging rev
636 my rev@0b76e65c8289+ other rev@4ce40f5aca24 ancestor rev@924404dff337
637 picked tool 'python ../merge' for rev (binary False symlink False)
592 my rev@0b76e65c8289+ other rev@4ce40f5aca24 ancestor rev@924404dff337 638 my rev@0b76e65c8289+ other rev@4ce40f5aca24 ancestor rev@924404dff337
593 launching merge tool: python ../merge *$TESTTMP/t/t/rev* * * (glob) 639 launching merge tool: python ../merge *$TESTTMP/t/t/rev* * * (glob)
594 merge tool returned: 0 640 merge tool returned: 0
595 0 files updated, 2 files merged, 0 files removed, 0 files unresolved 641 0 files updated, 2 files merged, 0 files removed, 0 files unresolved
596 (branch merge, don't forget to commit) 642 (branch merge, don't forget to commit)
618 getting a 664 getting a
619 b: both created -> m 665 b: both created -> m
620 picked tool 'python ../merge' for b (binary False symlink False) 666 picked tool 'python ../merge' for b (binary False symlink False)
621 merging b 667 merging b
622 my b@02963e448370+ other b@8dbce441892a ancestor b@000000000000 668 my b@02963e448370+ other b@8dbce441892a ancestor b@000000000000
669 picked tool 'python ../merge' for b (binary False symlink False)
670 my b@02963e448370+ other b@8dbce441892a ancestor b@000000000000
623 launching merge tool: python ../merge *$TESTTMP/t/t/b* * * (glob) 671 launching merge tool: python ../merge *$TESTTMP/t/t/b* * * (glob)
624 merge tool returned: 0 672 merge tool returned: 0
625 rev: versions differ -> m 673 rev: versions differ -> m
626 picked tool 'python ../merge' for rev (binary False symlink False) 674 picked tool 'python ../merge' for rev (binary False symlink False)
627 merging rev 675 merging rev
676 my rev@02963e448370+ other rev@8dbce441892a ancestor rev@924404dff337
677 picked tool 'python ../merge' for rev (binary False symlink False)
628 my rev@02963e448370+ other rev@8dbce441892a ancestor rev@924404dff337 678 my rev@02963e448370+ other rev@8dbce441892a ancestor rev@924404dff337
629 launching merge tool: python ../merge *$TESTTMP/t/t/rev* * * (glob) 679 launching merge tool: python ../merge *$TESTTMP/t/t/rev* * * (glob)
630 merge tool returned: 0 680 merge tool returned: 0
631 1 files updated, 2 files merged, 0 files removed, 0 files unresolved 681 1 files updated, 2 files merged, 0 files removed, 0 files unresolved
632 (branch merge, don't forget to commit) 682 (branch merge, don't forget to commit)
653 a: prompt keep -> a 703 a: prompt keep -> a
654 b: both created -> m 704 b: both created -> m
655 picked tool 'python ../merge' for b (binary False symlink False) 705 picked tool 'python ../merge' for b (binary False symlink False)
656 merging b 706 merging b
657 my b@0b76e65c8289+ other b@bdb19105162a ancestor b@000000000000 707 my b@0b76e65c8289+ other b@bdb19105162a ancestor b@000000000000
708 picked tool 'python ../merge' for b (binary False symlink False)
709 my b@0b76e65c8289+ other b@bdb19105162a ancestor b@000000000000
658 launching merge tool: python ../merge *$TESTTMP/t/t/b* * * (glob) 710 launching merge tool: python ../merge *$TESTTMP/t/t/b* * * (glob)
659 merge tool returned: 0 711 merge tool returned: 0
660 rev: versions differ -> m 712 rev: versions differ -> m
661 picked tool 'python ../merge' for rev (binary False symlink False) 713 picked tool 'python ../merge' for rev (binary False symlink False)
662 merging rev 714 merging rev
715 my rev@0b76e65c8289+ other rev@bdb19105162a ancestor rev@924404dff337
716 picked tool 'python ../merge' for rev (binary False symlink False)
663 my rev@0b76e65c8289+ other rev@bdb19105162a ancestor rev@924404dff337 717 my rev@0b76e65c8289+ other rev@bdb19105162a ancestor rev@924404dff337
664 launching merge tool: python ../merge *$TESTTMP/t/t/rev* * * (glob) 718 launching merge tool: python ../merge *$TESTTMP/t/t/rev* * * (glob)
665 merge tool returned: 0 719 merge tool returned: 0
666 0 files updated, 2 files merged, 0 files removed, 0 files unresolved 720 0 files updated, 2 files merged, 0 files removed, 0 files unresolved
667 (branch merge, don't forget to commit) 721 (branch merge, don't forget to commit)
689 removing a 743 removing a
690 b: remote moved from a -> m 744 b: remote moved from a -> m
691 picked tool 'python ../merge' for b (binary False symlink False) 745 picked tool 'python ../merge' for b (binary False symlink False)
692 merging a and b to b 746 merging a and b to b
693 my b@e300d1c794ec+ other b@49b6d8032493 ancestor a@924404dff337 747 my b@e300d1c794ec+ other b@49b6d8032493 ancestor a@924404dff337
748 picked tool 'python ../merge' for b (binary False symlink False)
749 my b@e300d1c794ec+ other b@49b6d8032493 ancestor a@924404dff337
694 launching merge tool: python ../merge *$TESTTMP/t/t/b* * * (glob) 750 launching merge tool: python ../merge *$TESTTMP/t/t/b* * * (glob)
695 merge tool returned: 0 751 merge tool returned: 0
696 rev: versions differ -> m 752 rev: versions differ -> m
697 picked tool 'python ../merge' for rev (binary False symlink False) 753 picked tool 'python ../merge' for rev (binary False symlink False)
698 merging rev 754 merging rev
755 my rev@e300d1c794ec+ other rev@49b6d8032493 ancestor rev@924404dff337
756 picked tool 'python ../merge' for rev (binary False symlink False)
699 my rev@e300d1c794ec+ other rev@49b6d8032493 ancestor rev@924404dff337 757 my rev@e300d1c794ec+ other rev@49b6d8032493 ancestor rev@924404dff337
700 launching merge tool: python ../merge *$TESTTMP/t/t/rev* * * (glob) 758 launching merge tool: python ../merge *$TESTTMP/t/t/rev* * * (glob)
701 merge tool returned: 0 759 merge tool returned: 0
702 0 files updated, 2 files merged, 0 files removed, 0 files unresolved 760 0 files updated, 2 files merged, 0 files removed, 0 files unresolved
703 (branch merge, don't forget to commit) 761 (branch merge, don't forget to commit)
724 preserving rev for resolve of rev 782 preserving rev for resolve of rev
725 b: local copied/moved from a -> m 783 b: local copied/moved from a -> m
726 picked tool 'python ../merge' for b (binary False symlink False) 784 picked tool 'python ../merge' for b (binary False symlink False)
727 merging b and a to b 785 merging b and a to b
728 my b@62e7bf090eba+ other a@f4db7e329e71 ancestor a@924404dff337 786 my b@62e7bf090eba+ other a@f4db7e329e71 ancestor a@924404dff337
787 picked tool 'python ../merge' for b (binary False symlink False)
788 my b@62e7bf090eba+ other a@f4db7e329e71 ancestor a@924404dff337
729 launching merge tool: python ../merge *$TESTTMP/t/t/b* * * (glob) 789 launching merge tool: python ../merge *$TESTTMP/t/t/b* * * (glob)
730 merge tool returned: 0 790 merge tool returned: 0
731 rev: versions differ -> m 791 rev: versions differ -> m
732 picked tool 'python ../merge' for rev (binary False symlink False) 792 picked tool 'python ../merge' for rev (binary False symlink False)
733 merging rev 793 merging rev
794 my rev@62e7bf090eba+ other rev@f4db7e329e71 ancestor rev@924404dff337
795 picked tool 'python ../merge' for rev (binary False symlink False)
734 my rev@62e7bf090eba+ other rev@f4db7e329e71 ancestor rev@924404dff337 796 my rev@62e7bf090eba+ other rev@f4db7e329e71 ancestor rev@924404dff337
735 launching merge tool: python ../merge *$TESTTMP/t/t/rev* * * (glob) 797 launching merge tool: python ../merge *$TESTTMP/t/t/rev* * * (glob)
736 merge tool returned: 0 798 merge tool returned: 0
737 0 files updated, 2 files merged, 0 files removed, 0 files unresolved 799 0 files updated, 2 files merged, 0 files removed, 0 files unresolved
738 (branch merge, don't forget to commit) 800 (branch merge, don't forget to commit)
770 my b@02963e448370+ other a@2b958612230f ancestor a@924404dff337 832 my b@02963e448370+ other a@2b958612230f ancestor a@924404dff337
771 premerge successful 833 premerge successful
772 rev: versions differ -> m 834 rev: versions differ -> m
773 picked tool 'python ../merge' for rev (binary False symlink False) 835 picked tool 'python ../merge' for rev (binary False symlink False)
774 merging rev 836 merging rev
837 my rev@02963e448370+ other rev@2b958612230f ancestor rev@924404dff337
838 picked tool 'python ../merge' for rev (binary False symlink False)
775 my rev@02963e448370+ other rev@2b958612230f ancestor rev@924404dff337 839 my rev@02963e448370+ other rev@2b958612230f ancestor rev@924404dff337
776 launching merge tool: python ../merge *$TESTTMP/t/t/rev* * * (glob) 840 launching merge tool: python ../merge *$TESTTMP/t/t/rev* * * (glob)
777 merge tool returned: 0 841 merge tool returned: 0
778 1 files updated, 2 files merged, 0 files removed, 0 files unresolved 842 1 files updated, 2 files merged, 0 files removed, 0 files unresolved
779 (branch merge, don't forget to commit) 843 (branch merge, don't forget to commit)