facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-07 07:17:55 +03:00
Code Issues Projects Releases Wiki Activity

test-merge-tools: windows fixes

Browse Source 
- /bin/cat does not exist, expect 'cat'
- non-interactive mode is not correctly detected in pysh, force it
This commit is contained in:
Patrick Mezard 2009-05-21 22:43:38 +02:00
parent f8fb6f0d87
commit 75d91d6ef2
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tests/test-merge-tools
View File

@ -88,8 +88,7 @@ echo "true.executable=cat" >> .hg/hgrc
domerge -r 2
echo "# and true.executable set to cat with path works:"
domerge -r 2 --config merge-tools.true.executable=/bin/cat
domerge -r 2 --config merge-tools.true.executable=cat
echo
echo Tool selection and merge-patterns
@ -168,4 +167,4 @@ echo Merge post-processing
echo
echo "# cat is a bad merge-tool and doesn't change:"
domerge -r 2 --config merge-tools.true.checkchanged=1
domerge -y -r 2 --config merge-tools.true.checkchanged=1

4
tests/test-merge-tools.out
View File

@ -156,7 +156,7 @@ false.whatever=
true.priority=1
true.executable=cat
# hg update -C 1
# hg merge -r 2 --config merge-tools.true.executable=/bin/cat
# hg merge -r 2 --config merge-tools.true.executable=cat
revision 1
space
revision 0
@ -459,7 +459,7 @@ false.whatever=
true.priority=1
true.executable=cat
# hg update -C 1
# hg merge -r 2 --config merge-tools.true.checkchanged=1
# hg merge -y -r 2 --config merge-tools.true.checkchanged=1
revision 1
space
revision 0