Show More
@@ -415,14 +415,15 b' def manifestmerge(repo, wctx, p2, pa, br' | |||
|
415 | 415 | if partial and not partial(f): |
|
416 | 416 | continue |
|
417 | 417 | if n1 and n2: |
|
418 |
if |
|
|
419 | fa = f | |
|
420 | a = ma.get(f, nullid) | |
|
421 |
|
|
|
422 | fa = copy.get(f, f) | |
|
423 | # Note: f as default is wrong - we can't really make a 3-way | |
|
424 | # merge without an ancestor file. | |
|
425 |
|
|
|
418 | if f not in ma: | |
|
419 | # Note: f as ancestor is wrong - we can't really make a 3-way | |
|
420 | # merge without an ancestor file. | |
|
421 | fa = copy.get(f, f) | |
|
422 | actions['m'].append((f, (f, f, fa, False, pa.node()), | |
|
423 | "both created")) | |
|
424 | else: | |
|
425 | a = ma[f] | |
|
426 | fla = ma.flags(f) | |
|
426 | 427 | nol = 'l' not in fl1 + fl2 + fla |
|
427 | 428 | if n2 == a and fl2 == fla: |
|
428 | 429 | actions['k'].append((f, (), "keep")) # remote unchanged |
@@ -436,7 +437,7 b' def manifestmerge(repo, wctx, p2, pa, br' | |||
|
436 | 437 | elif nol and n1 == a: # local only changed 'x' |
|
437 | 438 | actions['g'].append((f, (fl1,), "remote is newer")) |
|
438 | 439 | else: # both changed something |
|
439 |
actions['m'].append((f, (f, f, f |
|
|
440 | actions['m'].append((f, (f, f, f, False, pa.node()), | |
|
440 | 441 | "versions differ")) |
|
441 | 442 | elif f in copied: # files we'll deal with on m2 side |
|
442 | 443 | pass |
@@ -343,7 +343,7 b' args:' | |||
|
343 | 343 | ancestor: 924404dff337, local: 62e7bf090eba+, remote: 49b6d8032493 |
|
344 | 344 | preserving b for resolve of b |
|
345 | 345 | preserving rev for resolve of rev |
|
346 | b: versions differ -> m | |
|
346 | b: both created -> m | |
|
347 | 347 | updating: b 1/2 files (50.00%) |
|
348 | 348 | picked tool 'python ../merge' for b (binary False symlink False) |
|
349 | 349 | merging b |
@@ -413,7 +413,7 b' m "um a c" "um x c" " " "10 do merg' | |||
|
413 | 413 | ancestor: 924404dff337, local: 86a2aa42fc76+, remote: af30c7647fc7 |
|
414 | 414 | preserving b for resolve of b |
|
415 | 415 | preserving rev for resolve of rev |
|
416 | b: versions differ -> m | |
|
416 | b: both created -> m | |
|
417 | 417 | updating: b 1/2 files (50.00%) |
|
418 | 418 | picked tool 'python ../merge' for b (binary False symlink False) |
|
419 | 419 | merging b |
@@ -446,7 +446,7 b' m "um a c" "um x c" " " "10 do merg' | |||
|
446 | 446 | a: other deleted -> r |
|
447 | 447 | removing a |
|
448 | 448 | updating: a 1/3 files (33.33%) |
|
449 | b: versions differ -> m | |
|
449 | b: both created -> m | |
|
450 | 450 | updating: b 2/3 files (66.67%) |
|
451 | 451 | picked tool 'python ../merge' for b (binary False symlink False) |
|
452 | 452 | merging b |
@@ -478,7 +478,7 b' m "um a c" "um x c" " " "10 do merg' | |||
|
478 | 478 | a: remote is newer -> g |
|
479 | 479 | getting a |
|
480 | 480 | updating: a 1/3 files (33.33%) |
|
481 | b: versions differ -> m | |
|
481 | b: both created -> m | |
|
482 | 482 | updating: b 2/3 files (66.67%) |
|
483 | 483 | picked tool 'python ../merge' for b (binary False symlink False) |
|
484 | 484 | merging b |
@@ -511,7 +511,7 b' m "um a c" "um x c" " " "10 do merg' | |||
|
511 | 511 | a: other deleted -> r |
|
512 | 512 | removing a |
|
513 | 513 | updating: a 1/3 files (33.33%) |
|
514 | b: versions differ -> m | |
|
514 | b: both created -> m | |
|
515 | 515 | updating: b 2/3 files (66.67%) |
|
516 | 516 | picked tool 'python ../merge' for b (binary False symlink False) |
|
517 | 517 | merging b |
@@ -543,7 +543,7 b' m "um a c" "um x c" " " "10 do merg' | |||
|
543 | 543 | a: remote is newer -> g |
|
544 | 544 | getting a |
|
545 | 545 | updating: a 1/3 files (33.33%) |
|
546 | b: versions differ -> m | |
|
546 | b: both created -> m | |
|
547 | 547 | updating: b 2/3 files (66.67%) |
|
548 | 548 | picked tool 'python ../merge' for b (binary False symlink False) |
|
549 | 549 | merging b |
@@ -574,7 +574,7 b' m "um a c" "um x c" " " "10 do merg' | |||
|
574 | 574 | preserving b for resolve of b |
|
575 | 575 | preserving rev for resolve of rev |
|
576 | 576 | a: keep -> k |
|
577 | b: versions differ -> m | |
|
577 | b: both created -> m | |
|
578 | 578 | updating: b 1/2 files (50.00%) |
|
579 | 579 | picked tool 'python ../merge' for b (binary False symlink False) |
|
580 | 580 | merging b |
@@ -609,7 +609,7 b' m "um a c" "um x c" " " "10 do merg' | |||
|
609 | 609 | a: prompt recreating -> g |
|
610 | 610 | getting a |
|
611 | 611 | updating: a 1/3 files (33.33%) |
|
612 | b: versions differ -> m | |
|
612 | b: both created -> m | |
|
613 | 613 | updating: b 2/3 files (66.67%) |
|
614 | 614 | picked tool 'python ../merge' for b (binary False symlink False) |
|
615 | 615 | merging b |
@@ -643,7 +643,7 b' m "um a c" "um x c" " " "10 do merg' | |||
|
643 | 643 | preserving rev for resolve of rev |
|
644 | 644 | a: prompt keep -> a |
|
645 | 645 | updating: a 1/3 files (33.33%) |
|
646 | b: versions differ -> m | |
|
646 | b: both created -> m | |
|
647 | 647 | updating: b 2/3 files (66.67%) |
|
648 | 648 | picked tool 'python ../merge' for b (binary False symlink False) |
|
649 | 649 | merging b |
@@ -188,7 +188,7 b' create a second head' | |||
|
188 | 188 | picked tool 'true' for a (binary False symlink False) |
|
189 | 189 | merging a |
|
190 | 190 | my a@1e71731e6fbb+ other a@83c51d0caff4 ancestor a@c19d34741b0a |
|
191 | b: versions differ -> m | |
|
191 | b: both created -> m | |
|
192 | 192 | updating: b 2/2 files (100.00%) |
|
193 | 193 | picked tool 'true' for b (binary False symlink False) |
|
194 | 194 | merging b |
General Comments 0
You need to be logged in to leave comments.
Login now