Show More
@@ -1023,6 +1023,13 b' def manifestmerge(' | |||
|
1023 | 1023 | (None, f, f, False, pa.node()), |
|
1024 | 1024 | b'prompt deleted/changed', |
|
1025 | 1025 | ) |
|
1026 | else: | |
|
1027 | mresult.addfile( | |
|
1028 | f, | |
|
1029 | mergestatemod.ACTION_KEEP_ABSENT, | |
|
1030 | None, | |
|
1031 | b'local not present, remote unchanged', | |
|
1032 | ) | |
|
1026 | 1033 | |
|
1027 | 1034 | if repo.ui.configbool(b'experimental', b'merge.checkpathconflicts'): |
|
1028 | 1035 | # If we are merging, look for path conflicts. |
@@ -572,28 +572,26 b' BROKEN: this should result in conflict' | |||
|
572 | 572 | $ hg update --clean 'desc("merge-deleting-the-file-from-deleted")' |
|
573 | 573 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
574 | 574 | $ hg merge 'desc("merge-keeping-the-file-from-deleted")' |
|
575 |
|
|
|
575 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
|
576 | 576 | (branch merge, don't forget to commit) |
|
577 | 577 | $ ls -1 |
|
578 | 578 | other-file |
|
579 | the-file | |
|
580 | 579 | |
|
581 | 580 | (merging a deletion with keeping β conflict) |
|
582 | 581 | BROKEN: this should result in conflict |
|
583 | 582 | |
|
584 | 583 | $ hg update --clean 'desc("merge-deleting-the-file-from-deleted")' |
|
585 |
0 files updated, 0 files merged, |
|
|
584 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
|
586 | 585 | $ hg merge 'desc("merge-keeping-the-file-from-updated")' |
|
587 |
|
|
|
586 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
|
588 | 587 | (branch merge, don't forget to commit) |
|
589 | 588 | $ ls -1 |
|
590 | 589 | other-file |
|
591 | the-file | |
|
592 | 590 | |
|
593 | 591 | (merging two deletion together β no conflict) |
|
594 | 592 | |
|
595 | 593 | $ hg update --clean 'desc("merge-deleting-the-file-from-updated")' |
|
596 |
0 files updated, 0 files merged, |
|
|
594 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
|
597 | 595 | $ hg merge 'desc("merge-deleting-the-file-from-deleted")' |
|
598 | 596 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
599 | 597 | (branch merge, don't forget to commit) |
@@ -606,23 +604,21 b' BROKEN: this should result in conflict' | |||
|
606 | 604 | $ hg update --clean 'desc("merge-deleting-the-file-from-updated")' |
|
607 | 605 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
608 | 606 | $ hg merge 'desc("merge-keeping-the-file-from-deleted")' |
|
609 |
|
|
|
607 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
|
610 | 608 | (branch merge, don't forget to commit) |
|
611 | 609 | $ ls -1 |
|
612 | 610 | other-file |
|
613 | the-file | |
|
614 | 611 | |
|
615 | 612 | (merging a deletion with keeping β conflict) |
|
616 | 613 | BROKEN: this should result in conflict |
|
617 | 614 | |
|
618 | 615 | $ hg update --clean 'desc("merge-deleting-the-file-from-updated")' |
|
619 |
0 files updated, 0 files merged, |
|
|
616 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
|
620 | 617 | $ hg merge 'desc("merge-keeping-the-file-from-updated")' |
|
621 |
|
|
|
618 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
|
622 | 619 | (branch merge, don't forget to commit) |
|
623 | 620 | $ ls -1 |
|
624 | 621 | other-file |
|
625 | the-file | |
|
626 | 622 | |
|
627 | 623 | (merging two "keeping" together β no conflict) |
|
628 | 624 |
General Comments 0
You need to be logged in to leave comments.
Login now