Show More
@@ -1,5 +1,3 | |||
|
1 | $ "$TESTDIR/hghave" system-sh || exit 80 | |
|
2 | ||
|
3 | 1 | test merge-tools configuration - mostly exercising filemerge.py |
|
4 | 2 | |
|
5 | 3 | $ unset HGMERGE # make sure HGMERGE doesn't interfere with the test |
@@ -281,18 +279,16 and true.executable set to cat with path | |||
|
281 | 279 | |
|
282 | 280 | environment variables in true.executable are handled: |
|
283 | 281 | |
|
284 | $ cat > $HGTMP/merge.sh <<EOF | |
|
285 | > #!/bin/sh | |
|
286 | > echo 'custom merge tool' | |
|
287 | > EOF | |
|
288 | $ chmod +x $HGTMP/merge.sh | |
|
282 | $ echo 'echo "custom merge tool"' > "$HGTMP/merge.sh" | |
|
289 | 283 | $ beforemerge |
|
290 | 284 | [merge-tools] |
|
291 | 285 | false.whatever= |
|
292 | 286 | true.priority=1 |
|
293 | 287 | true.executable=cat |
|
294 | 288 |
|
|
295 |
$ |
|
|
289 | $ hg --config merge-tools.true.executable='sh' \ | |
|
290 | > --config merge-tools.true.args="$HGTMP/merge.sh" \ | |
|
291 | > merge -r 2 | |
|
296 | 292 | merging f |
|
297 | 293 | custom merge tool |
|
298 | 294 | 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
@@ -753,11 +749,11 Merge using tool with a path that must b | |||
|
753 | 749 | true.executable=cat |
|
754 | 750 | # hg update -C 1 |
|
755 | 751 | $ cat <<EOF > 'my merge tool' |
|
756 | > #!/bin/sh | |
|
757 | 752 | > cat "\$1" "\$2" "\$3" > "\$4" |
|
758 | 753 | > EOF |
|
759 | $ chmod +x 'my merge tool' | |
|
760 |
|
|
|
754 | $ hg --config merge-tools.true.executable='sh' \ | |
|
755 | > --config merge-tools.true.args='"./my merge tool" $base $local $other $output' \ | |
|
756 | > merge -r 2 | |
|
761 | 757 | merging f |
|
762 | 758 | 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
|
763 | 759 | (branch merge, don't forget to commit) |
General Comments 0
You need to be logged in to leave comments.
Login now