Mercurial > hg
comparison tests/test-log.t @ 12316:4134686b83e1
tests: add exit codes to unified tests
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Thu, 16 Sep 2010 17:51:32 -0500 |
| parents | f2daa6ab514a |
| children | 92e30e135581 |
comparison
equal
deleted
inserted
replaced
| 12315:ca58f6475f1d | 12316:4134686b83e1 |
|---|---|
| 29 | 29 |
| 30 -f, directory | 30 -f, directory |
| 31 | 31 |
| 32 $ hg log -f dir | 32 $ hg log -f dir |
| 33 abort: cannot follow nonexistent file: "dir" | 33 abort: cannot follow nonexistent file: "dir" |
| 34 [255] | |
| 34 | 35 |
| 35 -f, but no args | 36 -f, but no args |
| 36 | 37 |
| 37 $ hg log -f | 38 $ hg log -f |
| 38 changeset: 4:66c1345dc4f9 | 39 changeset: 4:66c1345dc4f9 |
| 493 | 494 |
| 494 log -r "" | 495 log -r "" |
| 495 | 496 |
| 496 $ hg log -r '' | 497 $ hg log -r '' |
| 497 hg: parse error: empty query | 498 hg: parse error: empty query |
| 499 [255] | |
| 498 | 500 |
| 499 log -r <some unknown node id> | 501 log -r <some unknown node id> |
| 500 | 502 |
| 501 $ hg log -r 1000000000000000000000000000000000000000 | 503 $ hg log -r 1000000000000000000000000000000000000000 |
| 502 abort: unknown revision '1000000000000000000000000000000000000000'! | 504 abort: unknown revision '1000000000000000000000000000000000000000'! |
| 505 [255] | |
| 503 | 506 |
| 504 log -k r1 | 507 log -k r1 |
| 505 | 508 |
| 506 $ hg log -k r1 | 509 $ hg log -k r1 |
| 507 changeset: 1:3d5bf5654eda | 510 changeset: 1:3d5bf5654eda |
| 656 | 659 |
| 657 log -b dummy | 660 log -b dummy |
| 658 | 661 |
| 659 $ hg log -b dummy | 662 $ hg log -b dummy |
| 660 abort: unknown revision 'dummy'! | 663 abort: unknown revision 'dummy'! |
| 664 [255] | |
| 661 | 665 |
| 662 | 666 |
| 663 log -b . | 667 log -b . |
| 664 | 668 |
| 665 $ hg log -b . | 669 $ hg log -b . |
| 897 merging foo | 901 merging foo |
| 898 warning: conflicts during merge. | 902 warning: conflicts during merge. |
| 899 merging foo failed! | 903 merging foo failed! |
| 900 0 files updated, 0 files merged, 0 files removed, 1 files unresolved | 904 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
| 901 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon | 905 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
| 906 [1] | |
| 902 $ echo 'merge 1' > foo | 907 $ echo 'merge 1' > foo |
| 903 $ hg resolve -m foo | 908 $ hg resolve -m foo |
| 904 $ hg ci -m "First merge, related" | 909 $ hg ci -m "First merge, related" |
| 905 | 910 |
| 906 $ hg merge 4 | 911 $ hg merge 4 |
| 907 merging foo | 912 merging foo |
| 908 warning: conflicts during merge. | 913 warning: conflicts during merge. |
| 909 merging foo failed! | 914 merging foo failed! |
| 910 1 files updated, 0 files merged, 0 files removed, 1 files unresolved | 915 1 files updated, 0 files merged, 0 files removed, 1 files unresolved |
| 911 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon | 916 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
| 917 [1] | |
| 912 $ echo 'merge 2' > foo | 918 $ echo 'merge 2' > foo |
| 913 $ hg resolve -m foo | 919 $ hg resolve -m foo |
| 914 $ hg ci -m "Last merge, related" | 920 $ hg ci -m "Last merge, related" |
| 915 | 921 |
| 916 $ hg --config "extensions.graphlog=" glog | 922 $ hg --config "extensions.graphlog=" glog |