Mercurial > hg
diff tests/test-merge-tools.out @ 10775:c52057614c72 stable
Tests with spaces in paths
This allows most tests to succeed with
./run-tests.py --tmpdir='/tmp/hg test'
and introduces other tests for spaces and shell quoting
| author | Mads Kiilerich <mads@kiilerich.com> |
|---|---|
| date | Wed, 24 Mar 2010 01:43:24 +0100 |
| parents | 08a0f04b56bd |
| children | f2daa6ab514a |
line wrap: on
line diff
--- a/tests/test-merge-tools.out Fri Mar 26 17:02:49 2010 +0100 +++ b/tests/test-merge-tools.out Wed Mar 24 01:43:24 2010 +0100 @@ -497,6 +497,25 @@ # hg stat M f +# Merge using tool with a path that must be quoted: +[merge-tools] +false.whatever= +true.priority=1 +true.executable=cat +# hg update -C 1 +merging f +0 files updated, 1 files merged, 0 files removed, 0 files unresolved +(branch merge, don't forget to commit) +# cat f +revision 0 +space +revision 1 +space +revision 2 +space +# hg stat +M f + Merge post-processing