Show More
@@ -1,5 +1,3 b'' | |||
|
1 | $ "$TESTDIR/hghave" unix-permissions serve || exit 80 | |
|
2 | ||
|
3 | 1 |
|
|
4 | 2 | > [extensions] |
|
5 | 3 | > keyword = |
@@ -297,16 +295,20 b' Check whether expansion is filewise and ' | |||
|
297 | 295 | |
|
298 | 296 | $ echo '$Id$' > c |
|
299 | 297 | $ echo 'tests for different changenodes' >> c |
|
298 | #if unix-permissions | |
|
300 | 299 | $ chmod 600 c |
|
301 | 300 | $ ls -l c | cut -b 1-10 |
|
302 | 301 | -rw------- |
|
302 | #endif | |
|
303 | 303 | |
|
304 | 304 | commit file c |
|
305 | 305 | |
|
306 | 306 | $ hg commit -A -mcndiff -d '1 0' -u 'User Name <user@example.com>' |
|
307 | 307 | adding c |
|
308 | #if unix-permissions | |
|
308 | 309 | $ ls -l c | cut -b 1-10 |
|
309 | 310 | -rw------- |
|
311 | #endif | |
|
310 | 312 | |
|
311 | 313 | force expansion |
|
312 | 314 | |
@@ -330,10 +332,10 b' record' | |||
|
330 | 332 | |
|
331 | 333 | record chunk |
|
332 | 334 | |
|
333 | >>> lines = open('a').readlines() | |
|
335 | >>> lines = open('a', 'rb').readlines() | |
|
334 | 336 | >>> lines.insert(1, 'foo\n') |
|
335 | 337 | >>> lines.append('bar\n') |
|
336 | >>> open('a', 'w').writelines(lines) | |
|
338 | >>> open('a', 'wb').writelines(lines) | |
|
337 | 339 | $ hg record -d '10 1' -m rectest a<<EOF |
|
338 | 340 | > y |
|
339 | 341 | > y |
@@ -612,6 +614,7 b' Copy ignored file to ignored file: no ov' | |||
|
612 | 614 | cp symlink file; hg cp -A symlink file (part1) |
|
613 | 615 | - copied symlink points to kwfile: overwrite |
|
614 | 616 | |
|
617 | #if symlink | |
|
615 | 618 | $ cp sym i |
|
616 | 619 | $ ls -l i |
|
617 | 620 | -rw-r--r--* (glob) |
@@ -624,6 +627,7 b' cp symlink file; hg cp -A symlink file (' | |||
|
624 | 627 | expand $Id$ |
|
625 | 628 | $ hg forget i |
|
626 | 629 | $ rm i |
|
630 | #endif | |
|
627 | 631 | |
|
628 | 632 | Test different options of hg kwfiles |
|
629 | 633 | |
@@ -924,6 +928,7 b' kwexpand nonexistent' | |||
|
924 | 928 | nonexistent:* (glob) |
|
925 | 929 | |
|
926 | 930 | |
|
931 | #if serve | |
|
927 | 932 | hg serve |
|
928 | 933 | - expand with hgweb file |
|
929 | 934 | - no expansion with hgweb annotate/changeset/filediff |
@@ -987,6 +992,7 b' hg serve' | |||
|
987 | 992 | |
|
988 | 993 | |
|
989 | 994 | $ cat errors.log |
|
995 | #endif | |
|
990 | 996 | |
|
991 | 997 | Prepare merge and resolve tests |
|
992 | 998 |
General Comments 0
You need to be logged in to leave comments.
Login now