Show More
@@ -5655,7 +5655,11 b' def resolve(ui, repo, *pats, **opts):' | |||
|
5655 | 5655 | else: |
|
5656 | 5656 | # backup pre-resolve (merge uses .orig for its own purposes) |
|
5657 | 5657 | a = repo.wjoin(f) |
|
5658 | util.copyfile(a, a + ".resolve") | |
|
5658 | try: | |
|
5659 | util.copyfile(a, a + ".resolve") | |
|
5660 | except (IOError, OSError) as inst: | |
|
5661 | if inst.errno != errno.ENOENT: | |
|
5662 | raise | |
|
5659 | 5663 | |
|
5660 | 5664 | try: |
|
5661 | 5665 | # preresolve file |
@@ -5673,7 +5677,11 b' def resolve(ui, repo, *pats, **opts):' | |||
|
5673 | 5677 | # replace filemerge's .orig file with our resolve file |
|
5674 | 5678 | # for files in tocomplete, ms.resolve will not overwrite |
|
5675 | 5679 | # .orig -- only preresolve does |
|
5676 | util.rename(a + ".resolve", a + ".orig") | |
|
5680 | try: | |
|
5681 | util.rename(a + ".resolve", a + ".orig") | |
|
5682 | except OSError as inst: | |
|
5683 | if inst.errno != errno.ENOENT: | |
|
5684 | raise | |
|
5677 | 5685 | |
|
5678 | 5686 | for f in tocomplete: |
|
5679 | 5687 | try: |
@@ -579,6 +579,33 b' prompt with EOF' | |||
|
579 | 579 | ? f.orig |
|
580 | 580 | # hg resolve --list |
|
581 | 581 | U f |
|
582 | $ rm f | |
|
583 | $ hg resolve --all --config ui.merge=internal:prompt --config ui.interactive=true | |
|
584 | no tool found to merge f | |
|
585 | keep (l)ocal or take (o)ther? | |
|
586 | [1] | |
|
587 | $ aftermerge | |
|
588 | # cat f | |
|
589 | revision 1 | |
|
590 | space | |
|
591 | # hg stat | |
|
592 | M f | |
|
593 | # hg resolve --list | |
|
594 | U f | |
|
595 | $ hg resolve --all --config ui.merge=internal:prompt | |
|
596 | no tool found to merge f | |
|
597 | keep (l)ocal or take (o)ther? l | |
|
598 | (no more unresolved files) | |
|
599 | $ aftermerge | |
|
600 | # cat f | |
|
601 | revision 1 | |
|
602 | space | |
|
603 | # hg stat | |
|
604 | M f | |
|
605 | ? f.orig | |
|
606 | # hg resolve --list | |
|
607 | R f | |
|
608 | ||
|
582 | 609 | ui.merge specifies internal:dump: |
|
583 | 610 | |
|
584 | 611 | $ beforemerge |
General Comments 0
You need to be logged in to leave comments.
Login now