Mercurial > hg
comparison tests/test-merge-tools.t @ 26899:5f88e092f82c
resolve: don't abort when file is missing
A file being missing is a completely valid situation in which the user may want
to re-resolve merge conflicts. Mercurial already maintains backups of local
data, so this turns out to be easy to handle.
author | Siddharth Agarwal <sid0@fb.com> |
---|---|
date | Tue, 10 Nov 2015 17:16:59 -0800 |
parents | 33eb8a56d0c9 |
children | 7a8e9a985c3b |
comparison
equal
deleted
inserted
replaced
26898:33eb8a56d0c9 | 26899:5f88e092f82c |
---|---|
577 # hg stat | 577 # hg stat |
578 M f | 578 M f |
579 ? f.orig | 579 ? f.orig |
580 # hg resolve --list | 580 # hg resolve --list |
581 U f | 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 ui.merge specifies internal:dump: | 609 ui.merge specifies internal:dump: |
583 | 610 |
584 $ beforemerge | 611 $ beforemerge |
585 [merge-tools] | 612 [merge-tools] |
586 false.whatever= | 613 false.whatever= |