Mercurial > hg > mercurial-crew-with-dirclash
annotate tests/test-static-http.out @ 2548:0229ff95faec
Clarified message when nothing to merge is seen.
Sometimes there's a non-tip head waiting to be merged, especially after
pulling in remote changes while there were local modifications in the working
directory which had to be committed before 'hg merge' can work.
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Mon, 03 Jul 2006 19:14:29 +0200 |
parents | d90a9d7c7d4d |
children | 109a22f5434a |
rev | line source |
---|---|
1935
d32c442571f2
Removed obsolete workaround for error message in tests/test-static-http.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1933
diff
changeset
|
1 abort: Connection refused |
1323
60200b3fc839
Fix old-http test when no server exists.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1111
diff
changeset
|
2 255 |
1962
2a676ad52c22
tests: more portability fix for the old systems
TK Soh <teekaysoh@yahoo.com>
parents:
1935
diff
changeset
|
3 copy: No such file or directory |
1933
7544700fd931
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1929
diff
changeset
|
4 changeset: 0:53e17d176ae6 |
1111 | 5 tag: tip |
6 user: test | |
1933
7544700fd931
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1929
diff
changeset
|
7 date: Mon Jan 12 13:46:40 1970 +0000 |
1111 | 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 | |
2175
b2ae81a7df29
Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
2152
diff
changeset
|
15 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1111 | 16 checking changesets |
17 checking manifests | |
18 crosschecking files in changesets and manifests | |
19 checking files | |
20 1 files, 1 changesets, 1 total revisions | |
21 foo | |
2431
d90a9d7c7d4d
replace old-http:// syntax by static-http:// and deprecate the redundant hg://
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
2175
diff
changeset
|
22 pulling from static-http://localhost:20059/remote |
1111 | 23 searching for changes |
24 no changes found |