# HG changeset patch # User mpm@selenic.com # Date 2005-07-27 03:23:59 # Node ID 122449dd89db3b70c5fdba91b3dd28086ca10bbe # Parent 6592c4f5cd4f5f408b647314ce5c68f190a9bc24 Fix up test results No more errnos diff | sed changes .out message ok diff --git a/tests/test-bad-pull.out b/tests/test-bad-pull.out --- a/tests/test-bad-pull.out +++ b/tests/test-bad-pull.out @@ -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 diff --git a/tests/test-clone-failure.out b/tests/test-clone-failure.out --- a/tests/test-clone-failure.out +++ b/tests/test-clone-failure.out @@ -4,7 +4,7 @@ abort: repository a/.hg not found! 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 diff --git a/tests/test-flags.out b/tests/test-flags.out --- a/tests/test-flags.out +++ b/tests/test-flags.out @@ -14,8 +14,8 @@ pulling from ../test1 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 @@ pulling from ../test2 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 diff --git a/tests/test-merge3.out b/tests/test-merge3.out --- a/tests/test-merge3.out +++ b/tests/test-merge3.out @@ -6,5 +6,6 @@ + hg add b + rm b + hg commit -A '-mcomment #1' -d '0 0' +adding .out removing b b never committed! diff --git a/tests/test-merge6.out b/tests/test-merge6.out --- a/tests/test-merge6.out +++ b/tests/test-merge6.out @@ -27,8 +27,8 @@ pulling from ../B1 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 @@ pulling from ../A2 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' diff --git a/tests/test-pull.out b/tests/test-pull.out --- a/tests/test-pull.out +++ b/tests/test-pull.out @@ -7,8 +7,8 @@ 1 files, 1 changesets, 1 total revisions 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 diff --git a/tests/test-simple-update.out b/tests/test-simple-update.out --- a/tests/test-simple-update.out +++ b/tests/test-simple-update.out @@ -22,8 +22,8 @@ pulling from ../branch 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 diff --git a/tests/test-unrelated-pull.out b/tests/test-unrelated-pull.out --- a/tests/test-unrelated-pull.out +++ b/tests/test-unrelated-pull.out @@ -3,8 +3,8 @@ searching for changes 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 diff --git a/tests/test-up-local-change.out b/tests/test-up-local-change.out --- a/tests/test-up-local-change.out +++ b/tests/test-up-local-change.out @@ -10,7 +10,7 @@ adding a + 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 @@ 1 + hg diff -+ sed 's/\(\(---\|+++\).*\)\t.*/\1/' ++ sed 's/\(\(---\|+++\) [^ \t]*\)[ \t].*/\1/' diff -r 1e71731e6fbb a --- a/a +++ b/a