Mercurial > hg > mercurial-crew-with-dirclash
annotate tests/test-static-http.out @ 1700:e2f91e0acbb8
hgmerge: add cleanup functions
This patch adds functions cleanup, success and failure.
The last two of these should be used instead of exit.
Current code was changed to use them.
It also moves $HGTMP to the top of the file (it's used in the cleanup
function), changes the comment and removes now unneeded trap
in the diff+patch merge.
author | Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl> |
---|---|
date | Mon, 06 Feb 2006 17:32:06 -0600 |
parents | e89033eb90a5 |
children | 0b3f4be5c5bf 7d83a351a936 |
rev | line source |
---|---|
1347 | 1 abort: <urlopen error (111, 'Connection refused')> |
1323
60200b3fc839
Fix old-http test when no server exists.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1111
diff
changeset
|
2 255 |
60200b3fc839
Fix old-http test when no server exists.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1111
diff
changeset
|
3 ls: copy: No such file or directory |
1111 | 4 changeset: 0:61c9426e69fe |
5 tag: tip | |
6 user: test | |
7 date: Thu Jan 1 00:00:00 1970 +0000 | |
8 summary: test | |
9 | |
10 requesting all changes | |
11 adding changesets | |
12 adding manifests | |
13 adding file changes | |
14 added 1 changesets with 1 changes to 1 files | |
15 checking changesets | |
16 checking manifests | |
17 crosschecking files in changesets and manifests | |
18 checking files | |
19 1 files, 1 changesets, 1 total revisions | |
20 foo | |
21 pulling from old-http://localhost:20059/remote | |
22 searching for changes | |
23 no changes found |