Mercurial > hg > mercurial-crew-with-dirclash
annotate tests/test-filebranch.out @ 2435:ff2bac730b99
http client: support persistent connections.
uses keepalive module from urlgrabber package. tested against "hg serve",
cgi server, and through http proxy. used ethereal to verify that only
one tcp connection used during entire "hg pull" sequence.
if server supports keepalive, this makes latency of "hg pull" much lower.
| author | Vadim Gelfer <vadim.gelfer@gmail.com> |
|---|---|
| date | Thu, 15 Jun 2006 12:57:59 -0700 |
| parents | b2ae81a7df29 |
| children | fb493241d7f6 |
| rev | line source |
|---|---|
| 990 | 1 creating base |
|
2175
b2ae81a7df29
Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
2152
diff
changeset
|
2 4 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 990 | 3 creating branch a |
| 4 creating branch b | |
| 5 we shouldn't have anything but n state here | |
| 6 n 644 2 bar | |
| 7 n 644 3 baz | |
| 8 n 644 3 foo | |
| 9 n 644 2 quux | |
| 10 merging | |
| 11 pulling from ../a | |
| 12 searching for changes | |
| 13 adding changesets | |
| 14 adding manifests | |
| 15 adding file changes | |
| 1043 | 16 added 1 changesets with 2 changes to 2 files (+1 heads) |
|
2019
ced2d3620f95
add merge command. means same thing as "update -m".
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
1933
diff
changeset
|
17 (run 'hg heads' to see heads, 'hg merge' to merge) |
| 990 | 18 merging for foo |
| 19 resolving manifests | |
| 20 getting bar | |
| 21 merging foo | |
| 22 resolving foo | |
|
1922
6d50d6189269
ui: output the number of file updated/merged/removed/... on update
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1043
diff
changeset
|
23 1 files updated, 1 files merged, 0 files removed, 0 files unresolved |
|
6d50d6189269
ui: output the number of file updated/merged/removed/... on update
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1043
diff
changeset
|
24 (branch merge, don't forget to commit) |
| 990 | 25 we shouldn't have anything but foo in merge state here |
| 26 m 644 3 foo | |
| 27 main: we should have a merge here | |
| 28 rev offset length base linkrev nodeid p1 p2 | |
|
1933
7544700fd931
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1922
diff
changeset
|
29 0 0 77 0 0 c36078bec30d 000000000000 000000000000 |
|
7544700fd931
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1922
diff
changeset
|
30 1 77 73 1 1 182b283965f1 c36078bec30d 000000000000 |
|
7544700fd931
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1922
diff
changeset
|
31 2 150 71 2 2 a6aef98656b7 c36078bec30d 000000000000 |
|
7544700fd931
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1922
diff
changeset
|
32 3 221 72 3 3 0c2cc6fc80e2 182b283965f1 a6aef98656b7 |
| 993 | 33 log should show foo and quux changed |
|
1933
7544700fd931
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1922
diff
changeset
|
34 changeset: 3:0c2cc6fc80e2d4ee289bb658dbbe9ad932380fe9 |
| 993 | 35 tag: tip |
|
1933
7544700fd931
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1922
diff
changeset
|
36 parent: 1:182b283965f1069c0112784e30e7755ad1c0dd52 |
|
7544700fd931
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1922
diff
changeset
|
37 parent: 2:a6aef98656b71154cae9d87408abe6d0218c8045 |
| 993 | 38 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:
1922
diff
changeset
|
39 date: Mon Jan 12 13:46:40 1970 +0000 |
| 993 | 40 files: foo quux |
| 41 description: | |
| 42 merge | |
| 43 | |
| 44 | |
| 990 | 45 foo: we should have a merge here |
| 46 rev offset length base linkrev nodeid p1 p2 | |
| 47 0 0 3 0 0 b8e02f643373 000000000000 000000000000 | |
| 48 1 3 4 1 1 2ffeddde1b65 b8e02f643373 000000000000 | |
| 49 2 7 4 2 2 33d1fb69067a b8e02f643373 000000000000 | |
| 50 3 11 4 3 3 aa27919ee430 2ffeddde1b65 33d1fb69067a | |
| 51 bar: we shouldn't have a merge here | |
| 52 rev offset length base linkrev nodeid p1 p2 | |
| 53 0 0 3 0 0 b8e02f643373 000000000000 000000000000 | |
| 54 1 3 4 1 2 33d1fb69067a b8e02f643373 000000000000 | |
| 55 baz: we shouldn't have a merge here | |
| 56 rev offset length base linkrev nodeid p1 p2 | |
| 57 0 0 3 0 0 b8e02f643373 000000000000 000000000000 | |
| 58 1 3 4 1 1 2ffeddde1b65 b8e02f643373 000000000000 | |
| 59 quux: we shouldn't have a merge here | |
| 60 rev offset length base linkrev nodeid p1 p2 | |
| 61 0 0 3 0 0 b8e02f643373 000000000000 000000000000 | |
| 62 1 3 5 1 3 6128c0f33108 b8e02f643373 000000000000 | |
| 993 | 63 manifest entries should match tips of all files |
| 64 33d1fb69067a0139622a3fa3b7ba1cdb1367972e 644 bar | |
| 65 2ffeddde1b65b4827f6746174a145474129fa2ce 644 baz | |
| 66 aa27919ee4303cfd575e1fb932dd64d75aa08be4 644 foo | |
| 67 6128c0f33108e8cfbb4e0824d13ae48b466d7280 644 quux | |
| 990 | 68 everything should be clean now |
| 69 checking changesets | |
| 70 checking manifests | |
| 71 crosschecking files in changesets and manifests | |
| 72 checking files | |
| 73 4 files, 4 changesets, 10 total revisions |