# HG changeset patch # User Matt Mackall # Date 1120717645 28800 # Node ID 5d6177b72fcce0d025f17a6b5eb2c5865bc391f8 # Parent 27f53edc02b9d2e8a349e17b6ba9e26f44139811 Update tests diff -r 27f53edc02b9 -r 5d6177b72fcc tests/test-bad-pull.out --- a/tests/test-bad-pull.out Wed Jul 06 22:27:07 2005 -0800 +++ b/tests/test-bad-pull.out Wed Jul 06 22:27:25 2005 -0800 @@ -1,9 +1,6 @@ + hg clone http://localhost:20059/ copy requesting all changes -adding changesets abort: error 111: Connection refused -transaction abort! -rollback completed + echo 255 255 + ls copy @@ -13,10 +10,7 @@ + sleep 2 + hg clone http://localhost:20059/foo copy2 requesting all changes -adding changesets abort: HTTP Error 404: File not found -transaction abort! -rollback completed + echo 255 255 + set +x diff -r 27f53edc02b9 -r 5d6177b72fcc tests/test-clone-failure.out --- a/tests/test-clone-failure.out Wed Jul 06 22:27:07 2005 -0800 +++ b/tests/test-clone-failure.out Wed Jul 06 22:27:25 2005 -0800 @@ -1,21 +1,17 @@ + hg clone a b -abort: No such file or directory: a +abort: repository a/.hg not found! + echo 255 255 + hg clone http://127.0.0.1:3121/a b requesting all changes -adding changesets abort: error 111: Connection refused -transaction abort! -rollback completed + echo 255 255 + rm -rf b + mkdir a + chmod 000 a + hg clone a b -cp: cannot stat `a/.hg': Permission denied -abort: cp exited with status 1 +abort: repository a/.hg not found! + echo 255 255 + mkdir b @@ -30,8 +26,7 @@ + rm -rf a b + mkfifo a + hg clone a b -cp: cannot stat `a/.hg': Not a directory -abort: cp exited with status 1 +abort: repository a/.hg not found! + echo 255 255 + rm a diff -r 27f53edc02b9 -r 5d6177b72fcc tests/test-clone.out --- a/tests/test-clone.out Wed Jul 06 22:27:07 2005 -0800 +++ b/tests/test-clone.out Wed Jul 06 22:27:25 2005 -0800 @@ -5,6 +5,7 @@ + hg add a + hg commit -t test -u test -d '0 0' + hg clone . ../b +cloning by hardlink + cd ../b + cat a a @@ -15,6 +16,7 @@ checking files 1 files, 1 changesets, 1 total revisions + hg clone -U . ../c +cloning by hardlink + cd ../c + cat a cat: a: No such file or directory @@ -27,6 +29,7 @@ + mkdir ../d + cd ../d + hg clone ../a +cloning by hardlink + cd a + hg cat a a diff -r 27f53edc02b9 -r 5d6177b72fcc tests/test-hup --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/test-hup Wed Jul 06 22:27:25 2005 -0800 @@ -0,0 +1,16 @@ +#!/bin/sh + +hg init +mkfifo p + +hg serve --stdio < p & +P=$! +(echo lock; echo addchangegroup; sleep 5) > p & +Q=$! +sleep 1 +kill -HUP $P +sleep 1 +ls .hg + + + diff -r 27f53edc02b9 -r 5d6177b72fcc tests/test-hup.out --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/test-hup.out Wed Jul 06 22:27:25 2005 -0800 @@ -0,0 +1,10 @@ +0 +0 +adding changesets +killed! +transaction abort! +rollback completed +00changelog.d +00changelog.i +data +undo.dirstate diff -r 27f53edc02b9 -r 5d6177b72fcc tests/test-merge6.out --- a/tests/test-merge6.out Wed Jul 06 22:27:07 2005 -0800 +++ b/tests/test-merge6.out Wed Jul 06 22:27:25 2005 -0800 @@ -11,6 +11,7 @@ + hg commit -t 'commit text' -d '0 0' -u user + cd .. + hg clone A1 B1 +cloning by hardlink + cd A1 + rm bar + hg remove bar @@ -20,7 +21,9 @@ + hg commit -t 'commit test' -d '0 0' -u user + cd .. + hg clone A1 A2 +cloning by hardlink + hg clone B1 B2 +cloning by hardlink + cd A1 + hg pull ../B1 pulling from ../B1 diff -r 27f53edc02b9 -r 5d6177b72fcc tests/test-pull --- a/tests/test-pull Wed Jul 06 22:27:07 2005 -0800 +++ b/tests/test-pull Wed Jul 06 22:27:25 2005 -0800 @@ -7,7 +7,7 @@ hg addremove hg commit -t "1" hg verify -hg serve -p 20059 >/dev/null 2>&1 & +hg serve -p 20059 > /dev/null & cd .. hg clone http://localhost:20059/ copy diff -r 27f53edc02b9 -r 5d6177b72fcc tests/test-pull.out --- a/tests/test-pull.out Wed Jul 06 22:27:07 2005 -0800 +++ b/tests/test-pull.out Wed Jul 06 22:27:25 2005 -0800 @@ -18,3 +18,4 @@ pulling from http://localhost:20059/ searching for changes no changes found +killed! diff -r 27f53edc02b9 -r 5d6177b72fcc tests/test-simple-update.out --- a/tests/test-simple-update.out Wed Jul 06 22:27:07 2005 -0800 +++ b/tests/test-simple-update.out Wed Jul 06 22:27:25 2005 -0800 @@ -11,6 +11,7 @@ checking files 1 files, 1 changesets, 1 total revisions + hg clone . ../branch +cloning by hardlink + cd ../branch + hg co + echo bar diff -r 27f53edc02b9 -r 5d6177b72fcc tests/test-up-local-change.out --- a/tests/test-up-local-change.out Wed Jul 06 22:27:07 2005 -0800 +++ b/tests/test-up-local-change.out Wed Jul 06 22:27:25 2005 -0800 @@ -5,6 +5,7 @@ + hg addremove + hg commit -t 1 -u test -d '0 0' + hg clone . ../r2 +cloning by hardlink + cd ../r2 + hg up + echo abc