Show More
@@ -1,4 +1,4 b'' | |||||
1 | $ "$TESTDIR/hghave" baz || exit 80 |
|
1 | $ "$TESTDIR/hghave" baz symlink || exit 80 | |
2 |
|
2 | |||
3 | $ baz my-id "mercurial <mercurial@selenic.com>" |
|
3 | $ baz my-id "mercurial <mercurial@selenic.com>" | |
4 |
|
4 |
@@ -91,6 +91,8 b' script)' | |||||
91 | $ echo xyzzy > foo.txt |
|
91 | $ echo xyzzy > foo.txt | |
92 | $ cvsci -m "merge1+clobber" foo.txt |
|
92 | $ cvsci -m "merge1+clobber" foo.txt | |
93 |
|
93 | |||
|
94 | #if unix-permissions | |||
|
95 | ||||
94 | return to trunk and merge MYBRANCH1_2 |
|
96 | return to trunk and merge MYBRANCH1_2 | |
95 |
|
97 | |||
96 | $ cvscall -Q update -P -A |
|
98 | $ cvscall -Q update -P -A | |
@@ -200,5 +202,6 b' return to trunk and merge MYBRANCH1_2' | |||||
200 | Members: |
|
202 | Members: | |
201 | foo.txt:1.1.4.1->1.1.4.2 |
|
203 | foo.txt:1.1.4.1->1.1.4.2 | |
202 |
|
204 | |||
|
205 | #endif | |||
203 |
|
206 | |||
204 | $ cd .. |
|
207 | $ cd .. |
@@ -277,6 +277,8 b' and true.executable set to cat with path' | |||||
277 | # hg stat |
|
277 | # hg stat | |
278 | M f |
|
278 | M f | |
279 |
|
279 | |||
|
280 | #if unix-permissions | |||
|
281 | ||||
280 | environment variables in true.executable are handled: |
|
282 | environment variables in true.executable are handled: | |
281 |
|
283 | |||
282 | $ echo 'echo "custom merge tool"' > "$HGTMP/merge.sh" |
|
284 | $ echo 'echo "custom merge tool"' > "$HGTMP/merge.sh" | |
@@ -300,6 +302,8 b' environment variables in true.executable' | |||||
300 | # hg stat |
|
302 | # hg stat | |
301 | M f |
|
303 | M f | |
302 |
|
304 | |||
|
305 | #endif | |||
|
306 | ||||
303 | Tool selection and merge-patterns |
|
307 | Tool selection and merge-patterns | |
304 |
|
308 | |||
305 | merge-patterns specifies new tool false: |
|
309 | merge-patterns specifies new tool false: |
@@ -356,6 +356,8 b' test transplant into empty repository' | |||||
356 | $ cd .. |
|
356 | $ cd .. | |
357 |
|
357 | |||
358 |
|
358 | |||
|
359 | #if unix-permissions system-sh | |||
|
360 | ||||
359 | test filter |
|
361 | test filter | |
360 |
|
362 | |||
361 | $ hg init filter |
|
363 | $ hg init filter | |
@@ -443,6 +445,9 b' test transplant with filter handles inva' | |||||
443 | [255] |
|
445 | [255] | |
444 | $ cd .. |
|
446 | $ cd .. | |
445 |
|
447 | |||
|
448 | #endif | |||
|
449 | ||||
|
450 | ||||
446 | test with a win32ext like setup (differing EOLs) |
|
451 | test with a win32ext like setup (differing EOLs) | |
447 |
|
452 | |||
448 | $ hg init twin1 |
|
453 | $ hg init twin1 |
@@ -276,9 +276,11 b' Test patterns:' | |||||
276 | $ hg debugwalk NOEXIST |
|
276 | $ hg debugwalk NOEXIST | |
277 | NOEXIST: * (glob) |
|
277 | NOEXIST: * (glob) | |
278 |
|
278 | |||
|
279 | #if fifo | |||
279 | $ mkfifo fifo |
|
280 | $ mkfifo fifo | |
280 | $ hg debugwalk fifo |
|
281 | $ hg debugwalk fifo | |
281 | fifo: unsupported file type (type is fifo) |
|
282 | fifo: unsupported file type (type is fifo) | |
|
283 | #endif | |||
282 |
|
284 | |||
283 | $ rm fenugreek |
|
285 | $ rm fenugreek | |
284 | $ hg debugwalk fenugreek |
|
286 | $ hg debugwalk fenugreek |
General Comments 0
You need to be logged in to leave comments.
Login now