Mercurial > hg
comparison 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 |
comparison
equal
deleted
inserted
replaced
| 10772:1e819576e926 | 10775:c52057614c72 |
|---|---|
| 495 # cat f | 495 # cat f |
| 496 mergeresult | 496 mergeresult |
| 497 # hg stat | 497 # hg stat |
| 498 M f | 498 M f |
| 499 | 499 |
| 500 # Merge using tool with a path that must be quoted: | |
| 501 [merge-tools] | |
| 502 false.whatever= | |
| 503 true.priority=1 | |
| 504 true.executable=cat | |
| 505 # hg update -C 1 | |
| 506 merging f | |
| 507 0 files updated, 1 files merged, 0 files removed, 0 files unresolved | |
| 508 (branch merge, don't forget to commit) | |
| 509 # cat f | |
| 510 revision 0 | |
| 511 space | |
| 512 revision 1 | |
| 513 space | |
| 514 revision 2 | |
| 515 space | |
| 516 # hg stat | |
| 517 M f | |
| 518 | |
| 500 | 519 |
| 501 Merge post-processing | 520 Merge post-processing |
| 502 | 521 |
| 503 # cat is a bad merge-tool and doesn't change: | 522 # cat is a bad merge-tool and doesn't change: |
| 504 [merge-tools] | 523 [merge-tools] |