Mercurial > hg-stable
changeset 775:122449dd89db
Fix up test results
No more errnos
diff | sed changes
.out message ok
| author | mpm@selenic.com |
|---|---|
| date | Tue, 26 Jul 2005 19:23:59 -0800 |
| parents | 6592c4f5cd4f |
| children | 7635a3f14ad4 |
| files | tests/test-bad-pull.out tests/test-clone-failure.out tests/test-flags.out tests/test-merge3.out tests/test-merge6.out tests/test-pull.out tests/test-simple-update.out tests/test-unrelated-pull.out tests/test-up-local-change.out |
| diffstat | 9 files changed, 19 insertions(+), 18 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test-bad-pull.out Tue Jul 26 19:03:45 2005 -0800 +++ b/tests/test-bad-pull.out Tue Jul 26 19:23:59 2005 -0800 @@ -1,6 +1,6 @@ + hg clone http://localhost:20059/ copy requesting all changes -abort: error 111: Connection refused +abort: error: Connection refused + echo 255 255 + ls copy
--- a/tests/test-clone-failure.out Tue Jul 26 19:03:45 2005 -0800 +++ b/tests/test-clone-failure.out Tue Jul 26 19:23:59 2005 -0800 @@ -4,7 +4,7 @@ 255 + hg clone http://127.0.0.1:3121/a b requesting all changes -abort: error 111: Connection refused +abort: error: Connection refused + echo 255 255 + rm -rf b
--- a/tests/test-flags.out Tue Jul 26 19:03:45 2005 -0800 +++ b/tests/test-flags.out Tue Jul 26 19:23:59 2005 -0800 @@ -14,8 +14,8 @@ requesting all changes adding changesets adding manifests -adding file revisions -modified 2 files, added 1 changesets and 2 new revisions +adding file changes +added 1 changesets with 2 changes to 2 files (run 'hg update' to get a working copy) + hg co + chmod +x a @@ -28,8 +28,8 @@ searching for changes adding changesets adding manifests -adding file revisions -modified 1 files, added 1 changesets and 1 new revisions +adding file changes +added 1 changesets with 1 changes to 1 files (run 'hg update' to get a working copy) + hg heads changeset: 2:3ef54330565526bebf37a0d9bf540c283fd133a1
--- a/tests/test-merge3.out Tue Jul 26 19:03:45 2005 -0800 +++ b/tests/test-merge3.out Tue Jul 26 19:23:59 2005 -0800 @@ -6,5 +6,6 @@ + hg add b + rm b + hg commit -A '-mcomment #1' -d '0 0' +adding .out removing b b never committed!
--- a/tests/test-merge6.out Tue Jul 26 19:03:45 2005 -0800 +++ b/tests/test-merge6.out Tue Jul 26 19:23:59 2005 -0800 @@ -27,8 +27,8 @@ searching for changes adding changesets adding manifests -adding file revisions -modified 1 files, added 1 changesets and 1 new revisions +adding file changes +added 1 changesets with 1 changes to 1 files (run 'hg update' to get a working copy) + hg update -m + hg commit -m 'commit test' -d '0 0' @@ -42,8 +42,8 @@ searching for changes adding changesets adding manifests -adding file revisions -modified 0 files, added 1 changesets and 0 new revisions +adding file changes +added 1 changesets with 0 changes to 0 files (run 'hg update' to get a working copy) + hg update -m + hg commit -m 'commit test' -d '0 0'
--- a/tests/test-pull.out Tue Jul 26 19:03:45 2005 -0800 +++ b/tests/test-pull.out Tue Jul 26 19:23:59 2005 -0800 @@ -7,8 +7,8 @@ requesting all changes adding changesets adding manifests -adding file revisions -modified 1 files, added 1 changesets and 1 new revisions +adding file changes +added 1 changesets with 1 changes to 1 files checking changesets checking manifests crosschecking files in changesets and manifests
--- a/tests/test-simple-update.out Tue Jul 26 19:03:45 2005 -0800 +++ b/tests/test-simple-update.out Tue Jul 26 19:23:59 2005 -0800 @@ -22,8 +22,8 @@ searching for changes adding changesets adding manifests -adding file revisions -modified 1 files, added 1 changesets and 1 new revisions +adding file changes +added 1 changesets with 1 changes to 1 files (run 'hg update' to get a working copy) + hg verify checking changesets
--- a/tests/test-unrelated-pull.out Tue Jul 26 19:03:45 2005 -0800 +++ b/tests/test-unrelated-pull.out Tue Jul 26 19:23:59 2005 -0800 @@ -3,8 +3,8 @@ warning: pulling from an unrelated repository! adding changesets adding manifests -adding file revisions -modified 1 files, added 1 changesets and 1 new revisions +adding file changes +added 1 changesets with 1 changes to 1 files (run 'hg update' to get a working copy) changeset: 1:9a79c33a9db37480e40fbd2a65d62ebd2a3c441c tag: tip
--- a/tests/test-up-local-change.out Tue Jul 26 19:03:45 2005 -0800 +++ b/tests/test-up-local-change.out Tue Jul 26 19:23:59 2005 -0800 @@ -10,7 +10,7 @@ + hg up + echo abc + hg diff -+ sed 's/\(\(---\|+++\).*\)\t.*/\1/' ++ sed 's/\(\(---\|+++\) [^ \t]*\)[ \t].*/\1/' diff -r c19d34741b0a a --- a/a +++ b/a @@ -69,7 +69,7 @@ + hg diff -+ sed 's/\(\(---\|+++\).*\)\t.*/\1/' ++ sed 's/\(\(---\|+++\) [^ \t]*\)[ \t].*/\1/' diff -r 1e71731e6fbb a --- a/a +++ b/a