Mercurial > hg
comparison tests/test-merge-tools.t @ 17885:9a2cf955db84 stable
filemerge: use util.shellquote when calling merge (issue3581)
| author | Keegan Carruthers-Smith <keegancsmith@fb.com> |
|---|---|
| date | Fri, 26 Oct 2012 12:02:58 -0700 |
| parents | 973c2b0b403c |
| children | a19046744e4e |
comparison
equal
deleted
inserted
replaced
| 17884:0188ddfa844e | 17885:9a2cf955db84 |
|---|---|
| 771 revision 2 | 771 revision 2 |
| 772 space | 772 space |
| 773 # hg stat | 773 # hg stat |
| 774 M f | 774 M f |
| 775 | 775 |
| 776 Issue3581: Merging a filename that needs to be quoted | |
| 777 | |
| 778 $ beforemerge | |
| 779 [merge-tools] | |
| 780 false.whatever= | |
| 781 true.priority=1 | |
| 782 true.executable=cat | |
| 783 # hg update -C 1 | |
| 784 $ echo "revision 4" > '"; exit 1; echo "' | |
| 785 $ hg commit -Am "revision 4" | |
| 786 adding "; exit 1; echo " | |
| 787 warning: filename contains '"', which is reserved on Windows: '"; exit 1; echo "' | |
| 788 $ hg update -C 1 > /dev/null | |
| 789 $ echo "revision 5" > '"; exit 1; echo "' | |
| 790 $ hg commit -Am "revision 5" | |
| 791 adding "; exit 1; echo " | |
| 792 warning: filename contains '"', which is reserved on Windows: '"; exit 1; echo "' | |
| 793 created new head | |
| 794 $ hg merge --config merge-tools.true.executable="true" -r 4 | |
| 795 merging "; exit 1; echo " | |
| 796 0 files updated, 1 files merged, 0 files removed, 0 files unresolved | |
| 797 (branch merge, don't forget to commit) | |
| 798 $ hg update -C 1 > /dev/null | |
| 799 | |
| 776 Merge post-processing | 800 Merge post-processing |
| 777 | 801 |
| 778 cat is a bad merge-tool and doesn't change: | 802 cat is a bad merge-tool and doesn't change: |
| 779 | 803 |
| 780 $ beforemerge | 804 $ beforemerge |