Mercurial > hg > mercurial-crew-with-dirclash
annotate tests/test-ssh.out @ 3295:764688cf51e5
merge: remember rename copies and parents properly on commit
record copies in dirstate even if rename was remote
this lets us record it properly at commit
teach checkfilemerge about copies, including merge cases
pull old copy code out of commit
extend rename-merge1 test to show file index
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Sun, 08 Oct 2006 19:57:45 -0500 |
parents | 7ae37d99d47e |
children | 8770b4870e22 |
rev | line source |
---|---|
1110 | 1 # creating 'remote' |
3274
7ae37d99d47e
ssh: make the error message more clear, add a testcase
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
3012
diff
changeset
|
2 # repo not found error |
7ae37d99d47e
ssh: make the error message more clear, add a testcase
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
3012
diff
changeset
|
3 abort: no suitable response from remote hg! |
7ae37d99d47e
ssh: make the error message more clear, add a testcase
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
3012
diff
changeset
|
4 remote: abort: repository nonexistent not found! |
2612
ffb895f16925
add support for streaming clone.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2439
diff
changeset
|
5 # clone remote via stream |
ffb895f16925
add support for streaming clone.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2439
diff
changeset
|
6 streaming all changes |
ffb895f16925
add support for streaming clone.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2439
diff
changeset
|
7 XXX files to transfer, XXX bytes of data |
3012
fa4229c60dd7
Allow for MB/sec transfer rates in test-http-proxy and test-ssh.
Lee Cantey <lcantey@gmail.com>
parents:
2673
diff
changeset
|
8 transferred XXX bytes in XXX seconds (XXX XB/sec) |
2612
ffb895f16925
add support for streaming clone.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2439
diff
changeset
|
9 XXX files updated, XXX files merged, XXX files removed, XXX files unresolved |
ffb895f16925
add support for streaming clone.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2439
diff
changeset
|
10 checking changesets |
ffb895f16925
add support for streaming clone.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2439
diff
changeset
|
11 checking manifests |
ffb895f16925
add support for streaming clone.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2439
diff
changeset
|
12 crosschecking files in changesets and manifests |
ffb895f16925
add support for streaming clone.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2439
diff
changeset
|
13 checking files |
ffb895f16925
add support for streaming clone.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2439
diff
changeset
|
14 1 files, 1 changesets, 1 total revisions |
ffb895f16925
add support for streaming clone.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2439
diff
changeset
|
15 # clone remote via pull |
1110 | 16 requesting all changes |
17 adding changesets | |
18 adding manifests | |
19 adding file changes | |
20 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
|
21 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1110 | 22 # verify |
23 checking changesets | |
24 checking manifests | |
25 crosschecking files in changesets and manifests | |
26 checking files | |
27 1 files, 1 changesets, 1 total revisions | |
28 # empty default pull | |
29 default = ssh://user@dummy/remote | |
30 pulling from ssh://user@dummy/remote | |
31 searching for changes | |
32 no changes found | |
33 # local change | |
34 # updating rc | |
35 # find outgoing | |
36 searching for changes | |
1933
7544700fd931
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1168
diff
changeset
|
37 changeset: 1:c54836a570be |
1110 | 38 tag: tip |
39 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:
1168
diff
changeset
|
40 date: Mon Jan 12 13:46:40 1970 +0000 |
1110 | 41 summary: add |
42 | |
1982
70ba0c86da8b
Added test for incoming via ssh.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1933
diff
changeset
|
43 # find incoming on the remote side |
70ba0c86da8b
Added test for incoming via ssh.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1933
diff
changeset
|
44 searching for changes |
70ba0c86da8b
Added test for incoming via ssh.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1933
diff
changeset
|
45 changeset: 1:c54836a570be |
70ba0c86da8b
Added test for incoming via ssh.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1933
diff
changeset
|
46 tag: tip |
70ba0c86da8b
Added test for incoming via ssh.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1933
diff
changeset
|
47 user: test |
70ba0c86da8b
Added test for incoming via ssh.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1933
diff
changeset
|
48 date: Mon Jan 12 13:46:40 1970 +0000 |
70ba0c86da8b
Added test for incoming via ssh.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1933
diff
changeset
|
49 summary: add |
70ba0c86da8b
Added test for incoming via ssh.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1933
diff
changeset
|
50 |
1110 | 51 # push |
52 pushing to ssh://user@dummy/remote | |
53 searching for changes | |
54 remote: adding changesets | |
55 remote: adding manifests | |
56 remote: adding file changes | |
57 remote: added 1 changesets with 1 changes to 1 files | |
58 # check remote tip | |
1933
7544700fd931
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1168
diff
changeset
|
59 changeset: 1:c54836a570be |
1110 | 60 tag: tip |
61 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:
1168
diff
changeset
|
62 date: Mon Jan 12 13:46:40 1970 +0000 |
1110 | 63 summary: add |
64 | |
65 checking changesets | |
66 checking manifests | |
67 crosschecking files in changesets and manifests | |
68 checking files | |
69 1 files, 2 changesets, 2 total revisions | |
70 bleah | |
2439
e8c4f3d3df8c
extend network protocol to stop clients from locking servers
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2175
diff
changeset
|
71 # push should fail |
e8c4f3d3df8c
extend network protocol to stop clients from locking servers
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2175
diff
changeset
|
72 pushing to ssh://user@dummy/remote |
e8c4f3d3df8c
extend network protocol to stop clients from locking servers
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2175
diff
changeset
|
73 searching for changes |
e8c4f3d3df8c
extend network protocol to stop clients from locking servers
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2175
diff
changeset
|
74 abort: unsynced remote changes! |
e8c4f3d3df8c
extend network protocol to stop clients from locking servers
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2175
diff
changeset
|
75 (did you forget to sync? use push -f to force) |
e8c4f3d3df8c
extend network protocol to stop clients from locking servers
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2175
diff
changeset
|
76 # push should succeed |
e8c4f3d3df8c
extend network protocol to stop clients from locking servers
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2175
diff
changeset
|
77 pushing to ssh://user@dummy/remote |
e8c4f3d3df8c
extend network protocol to stop clients from locking servers
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2175
diff
changeset
|
78 searching for changes |
e8c4f3d3df8c
extend network protocol to stop clients from locking servers
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2175
diff
changeset
|
79 remote: adding changesets |
e8c4f3d3df8c
extend network protocol to stop clients from locking servers
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2175
diff
changeset
|
80 remote: adding manifests |
e8c4f3d3df8c
extend network protocol to stop clients from locking servers
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2175
diff
changeset
|
81 remote: adding file changes |
e8c4f3d3df8c
extend network protocol to stop clients from locking servers
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2175
diff
changeset
|
82 remote: added 1 changesets with 1 changes to 1 files |
3274
7ae37d99d47e
ssh: make the error message more clear, add a testcase
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
3012
diff
changeset
|
83 Got arguments 1:user@dummy 2:hg -R nonexistent serve --stdio 3: 4: 5: |
1110 | 84 Got arguments 1:user@dummy 2:hg -R remote serve --stdio 3: 4: 5: |
85 Got arguments 1:user@dummy 2:hg -R remote serve --stdio 3: 4: 5: | |
86 Got arguments 1:user@dummy 2:hg -R remote serve --stdio 3: 4: 5: | |
2612
ffb895f16925
add support for streaming clone.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2439
diff
changeset
|
87 Got arguments 1:user@dummy 2:hg -R remote serve --stdio 3: 4: 5: |
1982
70ba0c86da8b
Added test for incoming via ssh.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1933
diff
changeset
|
88 Got arguments 1:user@dummy 2:hg -R local serve --stdio 3: 4: 5: |
1110 | 89 Got arguments 1:user@dummy 2:hg -R remote serve --stdio 3: 4: 5: |
2673
109a22f5434a
hooks: add url to changegroup, incoming, prechangegroup, pretxnchangegroup hooks
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2612
diff
changeset
|
90 changegroup in remote: u=remote:ssh:127.0.0.1 |
2439
e8c4f3d3df8c
extend network protocol to stop clients from locking servers
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2175
diff
changeset
|
91 Got arguments 1:user@dummy 2:hg -R remote serve --stdio 3: 4: 5: |
e8c4f3d3df8c
extend network protocol to stop clients from locking servers
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2175
diff
changeset
|
92 Got arguments 1:user@dummy 2:hg -R remote serve --stdio 3: 4: 5: |
2673
109a22f5434a
hooks: add url to changegroup, incoming, prechangegroup, pretxnchangegroup hooks
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2612
diff
changeset
|
93 changegroup in remote: u=remote:ssh:127.0.0.1 |