Mercurial > hg > mercurial-crew-with-dirclash
annotate tests/test-static-http.out @ 5483:0c43f87baba3 default tip
Fix file-changed-to-dir and dir-to-file commits (issue660).
Allow adding to dirstate files that clash with previously existing
but marked for removal. Protect from reintroducing clashes by revert.
This change doesn't address related issues with update. Current
workaround is to do "clean" update by manually removing conflicting
files/dirs from working directory.
author | Maxim Dounin <mdounin@mdounin.ru> |
---|---|
date | Sat, 27 Oct 2007 16:27:55 +0400 |
parents | e3a0c092b4e2 |
children |
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 | |
2673
109a22f5434a
hooks: add url to changegroup, incoming, prechangegroup, pretxnchangegroup hooks
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2431
diff
changeset
|
22 adding quux |
5384
e3a0c092b4e2
Allow tests to run in parallel.
Bryan O'Sullivan <bos@serpentine.com>
parents:
5314
diff
changeset
|
23 changegroup hook: HG_NODE=34401e0e9971e9720b613d9089ffa9a6eefb3d2d HG_SOURCE=pull HG_URL=static-http://localhost/remote |
e3a0c092b4e2
Allow tests to run in parallel.
Bryan O'Sullivan <bos@serpentine.com>
parents:
5314
diff
changeset
|
24 pulling from static-http://localhost/remote |
1111 | 25 searching for changes |
2673
109a22f5434a
hooks: add url to changegroup, incoming, prechangegroup, pretxnchangegroup hooks
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2431
diff
changeset
|
26 adding changesets |
109a22f5434a
hooks: add url to changegroup, incoming, prechangegroup, pretxnchangegroup hooks
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2431
diff
changeset
|
27 adding manifests |
109a22f5434a
hooks: add url to changegroup, incoming, prechangegroup, pretxnchangegroup hooks
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2431
diff
changeset
|
28 adding file changes |
109a22f5434a
hooks: add url to changegroup, incoming, prechangegroup, pretxnchangegroup hooks
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2431
diff
changeset
|
29 added 1 changesets with 1 changes to 1 files |
109a22f5434a
hooks: add url to changegroup, incoming, prechangegroup, pretxnchangegroup hooks
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2431
diff
changeset
|
30 (run 'hg update' to get a working copy) |
5314
598dae804a5f
Test static-http calls on '/' URI (issue 747)
Patrick Mezard <pmezard@gmail.com>
parents:
4290
diff
changeset
|
31 % test with "/" URI (issue 747) |
598dae804a5f
Test static-http calls on '/' URI (issue 747)
Patrick Mezard <pmezard@gmail.com>
parents:
4290
diff
changeset
|
32 requesting all changes |
598dae804a5f
Test static-http calls on '/' URI (issue 747)
Patrick Mezard <pmezard@gmail.com>
parents:
4290
diff
changeset
|
33 adding changesets |
598dae804a5f
Test static-http calls on '/' URI (issue 747)
Patrick Mezard <pmezard@gmail.com>
parents:
4290
diff
changeset
|
34 adding manifests |
598dae804a5f
Test static-http calls on '/' URI (issue 747)
Patrick Mezard <pmezard@gmail.com>
parents:
4290
diff
changeset
|
35 adding file changes |
598dae804a5f
Test static-http calls on '/' URI (issue 747)
Patrick Mezard <pmezard@gmail.com>
parents:
4290
diff
changeset
|
36 added 1 changesets with 1 changes to 1 files |
598dae804a5f
Test static-http calls on '/' URI (issue 747)
Patrick Mezard <pmezard@gmail.com>
parents:
4290
diff
changeset
|
37 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
598dae804a5f
Test static-http calls on '/' URI (issue 747)
Patrick Mezard <pmezard@gmail.com>
parents:
4290
diff
changeset
|
38 checking changesets |
598dae804a5f
Test static-http calls on '/' URI (issue 747)
Patrick Mezard <pmezard@gmail.com>
parents:
4290
diff
changeset
|
39 checking manifests |
598dae804a5f
Test static-http calls on '/' URI (issue 747)
Patrick Mezard <pmezard@gmail.com>
parents:
4290
diff
changeset
|
40 crosschecking files in changesets and manifests |
598dae804a5f
Test static-http calls on '/' URI (issue 747)
Patrick Mezard <pmezard@gmail.com>
parents:
4290
diff
changeset
|
41 checking files |
598dae804a5f
Test static-http calls on '/' URI (issue 747)
Patrick Mezard <pmezard@gmail.com>
parents:
4290
diff
changeset
|
42 1 files, 1 changesets, 1 total revisions |
598dae804a5f
Test static-http calls on '/' URI (issue 747)
Patrick Mezard <pmezard@gmail.com>
parents:
4290
diff
changeset
|
43 a |
5384
e3a0c092b4e2
Allow tests to run in parallel.
Bryan O'Sullivan <bos@serpentine.com>
parents:
5314
diff
changeset
|
44 default = static-http://localhost/ |