Show More
@@ -817,6 +817,22 b' def manifestmerge(' | |||
|
817 | 817 | args = (f, f, None, False, pa.node()) |
|
818 | 818 | msg = b'both created' |
|
819 | 819 | mresult.addfile(f, mergestatemod.ACTION_MERGE, args, msg) |
|
820 | elif f in branch_copies1.copy: | |
|
821 | fa = branch_copies1.copy[f] | |
|
822 | mresult.addfile( | |
|
823 | f, | |
|
824 | mergestatemod.ACTION_MERGE, | |
|
825 | (f, fa, fa, False, pa.node()), | |
|
826 | b'local replaced from %s' % fa, | |
|
827 | ) | |
|
828 | elif f in branch_copies2.copy: | |
|
829 | fa = branch_copies2.copy[f] | |
|
830 | mresult.addfile( | |
|
831 | f, | |
|
832 | mergestatemod.ACTION_MERGE, | |
|
833 | (fa, f, fa, False, pa.node()), | |
|
834 | b'other replaced from %s' % fa, | |
|
835 | ) | |
|
820 | 836 | else: |
|
821 | 837 | a = ma[f] |
|
822 | 838 | fla = ma.flags(f) |
@@ -496,16 +496,17 b' should be propagated to y.' | |||
|
496 | 496 | 1 files updated, 0 files merged, 0 files removed, 1 files unresolved |
|
497 | 497 | use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon |
|
498 | 498 | [1] |
|
499 | BROKEN: should be "modified" | |
|
499 | This should ideally be "modified", but we will probably not be able to fix | |
|
500 | that in the filelog case. | |
|
500 | 501 | $ cat y |
|
501 | 502 | original |
|
502 | 503 | #else |
|
503 | 504 | $ hg merge 2 |
|
504 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
|
505 | merging x and y to y | |
|
506 | 0 files updated, 1 files merged, 0 files removed, 0 files unresolved | |
|
505 | 507 | (branch merge, don't forget to commit) |
|
506 | BROKEN: should be "modified" | |
|
507 | 508 | $ cat y |
|
508 | original | |
|
509 | modified | |
|
509 | 510 | #endif |
|
510 | 511 | Same as above, but in the opposite direction |
|
511 | 512 | #if filelog |
@@ -523,11 +524,11 b' BROKEN: should be "modified"' | |||
|
523 | 524 | #else |
|
524 | 525 | $ hg co -qC 2 |
|
525 | 526 | $ hg merge 3 |
|
526 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
|
527 | merging y and x to y | |
|
528 | 0 files updated, 1 files merged, 0 files removed, 0 files unresolved | |
|
527 | 529 | (branch merge, don't forget to commit) |
|
528 | BROKEN: should be "modified" | |
|
529 | 530 | $ cat y |
|
530 | original | |
|
531 | modified | |
|
531 | 532 | #endif |
|
532 | 533 | |
|
533 | 534 | Create x and y, then rename x to z on one side of merge, and rename y to z and |
General Comments 0
You need to be logged in to leave comments.
Login now