tests/test-ssh.out
author Thomas Arendsen Hein <thomas@intevation.de>
Tue, 02 May 2006 18:44:02 +0200
changeset 2175 b2ae81a7df29
parent 2152 57729c56a23c
child 2439 e8c4f3d3df8c
permissions -rw-r--r--
Make hg update more verbose by default (issue12) (including small changes to revert and backout to not show these stats with the exception of backout --merge) Show update stats (unless -q), e.g.: K files updated, L files merged, M files removed, N files unresolved Inform the user what to do after a merge: (branch merge, don't forget to commit) Inform the user what to do if a branch merge failed: There are unresolved merges, you can redo the full merge using: hg update -C X hg merge Y Inform the user what to do if a working directory merge failed: There are unresolved merges with locally modified files.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
1110
1032a505488c Add a simple dummy ssh test
mpm@selenic.com
parents:
diff changeset
     1
# creating 'remote'
1032a505488c Add a simple dummy ssh test
mpm@selenic.com
parents:
diff changeset
     2
# clone remote
1032a505488c Add a simple dummy ssh test
mpm@selenic.com
parents:
diff changeset
     3
requesting all changes
1032a505488c Add a simple dummy ssh test
mpm@selenic.com
parents:
diff changeset
     4
adding changesets
1032a505488c Add a simple dummy ssh test
mpm@selenic.com
parents:
diff changeset
     5
adding manifests
1032a505488c Add a simple dummy ssh test
mpm@selenic.com
parents:
diff changeset
     6
adding file changes
1032a505488c Add a simple dummy ssh test
mpm@selenic.com
parents:
diff changeset
     7
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
     8
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
1110
1032a505488c Add a simple dummy ssh test
mpm@selenic.com
parents:
diff changeset
     9
# verify
1032a505488c Add a simple dummy ssh test
mpm@selenic.com
parents:
diff changeset
    10
checking changesets
1032a505488c Add a simple dummy ssh test
mpm@selenic.com
parents:
diff changeset
    11
checking manifests
1032a505488c Add a simple dummy ssh test
mpm@selenic.com
parents:
diff changeset
    12
crosschecking files in changesets and manifests
1032a505488c Add a simple dummy ssh test
mpm@selenic.com
parents:
diff changeset
    13
checking files
1032a505488c Add a simple dummy ssh test
mpm@selenic.com
parents:
diff changeset
    14
1 files, 1 changesets, 1 total revisions
1032a505488c Add a simple dummy ssh test
mpm@selenic.com
parents:
diff changeset
    15
# empty default pull
1032a505488c Add a simple dummy ssh test
mpm@selenic.com
parents:
diff changeset
    16
default = ssh://user@dummy/remote
1032a505488c Add a simple dummy ssh test
mpm@selenic.com
parents:
diff changeset
    17
pulling from ssh://user@dummy/remote
1032a505488c Add a simple dummy ssh test
mpm@selenic.com
parents:
diff changeset
    18
searching for changes
1032a505488c Add a simple dummy ssh test
mpm@selenic.com
parents:
diff changeset
    19
no changes found
1032a505488c Add a simple dummy ssh test
mpm@selenic.com
parents:
diff changeset
    20
# local change
1032a505488c Add a simple dummy ssh test
mpm@selenic.com
parents:
diff changeset
    21
# updating rc
1032a505488c Add a simple dummy ssh test
mpm@selenic.com
parents:
diff changeset
    22
# find outgoing
1032a505488c Add a simple dummy ssh test
mpm@selenic.com
parents:
diff changeset
    23
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
    24
changeset:   1:c54836a570be
1110
1032a505488c Add a simple dummy ssh test
mpm@selenic.com
parents:
diff changeset
    25
tag:         tip
1032a505488c Add a simple dummy ssh test
mpm@selenic.com
parents:
diff changeset
    26
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
    27
date:        Mon Jan 12 13:46:40 1970 +0000
1110
1032a505488c Add a simple dummy ssh test
mpm@selenic.com
parents:
diff changeset
    28
summary:     add
1032a505488c Add a simple dummy ssh test
mpm@selenic.com
parents:
diff changeset
    29
1982
70ba0c86da8b Added test for incoming via ssh.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1933
diff changeset
    30
# find incoming on the remote side
70ba0c86da8b Added test for incoming via ssh.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1933
diff changeset
    31
searching for changes
70ba0c86da8b Added test for incoming via ssh.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1933
diff changeset
    32
changeset:   1:c54836a570be
70ba0c86da8b Added test for incoming via ssh.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1933
diff changeset
    33
tag:         tip
70ba0c86da8b Added test for incoming via ssh.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1933
diff changeset
    34
user:        test
70ba0c86da8b Added test for incoming via ssh.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1933
diff changeset
    35
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
    36
summary:     add
70ba0c86da8b Added test for incoming via ssh.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1933
diff changeset
    37
1110
1032a505488c Add a simple dummy ssh test
mpm@selenic.com
parents:
diff changeset
    38
# push
1032a505488c Add a simple dummy ssh test
mpm@selenic.com
parents:
diff changeset
    39
pushing to ssh://user@dummy/remote
1032a505488c Add a simple dummy ssh test
mpm@selenic.com
parents:
diff changeset
    40
searching for changes
1032a505488c Add a simple dummy ssh test
mpm@selenic.com
parents:
diff changeset
    41
remote: adding changesets
1032a505488c Add a simple dummy ssh test
mpm@selenic.com
parents:
diff changeset
    42
remote: adding manifests
1032a505488c Add a simple dummy ssh test
mpm@selenic.com
parents:
diff changeset
    43
remote: adding file changes
1032a505488c Add a simple dummy ssh test
mpm@selenic.com
parents:
diff changeset
    44
remote: added 1 changesets with 1 changes to 1 files
1032a505488c Add a simple dummy ssh test
mpm@selenic.com
parents:
diff changeset
    45
# 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
    46
changeset:   1:c54836a570be
1110
1032a505488c Add a simple dummy ssh test
mpm@selenic.com
parents:
diff changeset
    47
tag:         tip
1032a505488c Add a simple dummy ssh test
mpm@selenic.com
parents:
diff changeset
    48
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
    49
date:        Mon Jan 12 13:46:40 1970 +0000
1110
1032a505488c Add a simple dummy ssh test
mpm@selenic.com
parents:
diff changeset
    50
summary:     add
1032a505488c Add a simple dummy ssh test
mpm@selenic.com
parents:
diff changeset
    51
1032a505488c Add a simple dummy ssh test
mpm@selenic.com
parents:
diff changeset
    52
checking changesets
1032a505488c Add a simple dummy ssh test
mpm@selenic.com
parents:
diff changeset
    53
checking manifests
1032a505488c Add a simple dummy ssh test
mpm@selenic.com
parents:
diff changeset
    54
crosschecking files in changesets and manifests
1032a505488c Add a simple dummy ssh test
mpm@selenic.com
parents:
diff changeset
    55
checking files
1032a505488c Add a simple dummy ssh test
mpm@selenic.com
parents:
diff changeset
    56
1 files, 2 changesets, 2 total revisions
1032a505488c Add a simple dummy ssh test
mpm@selenic.com
parents:
diff changeset
    57
bleah
1032a505488c Add a simple dummy ssh test
mpm@selenic.com
parents:
diff changeset
    58
Got arguments 1:user@dummy 2:hg -R remote serve --stdio 3: 4: 5:
1032a505488c Add a simple dummy ssh test
mpm@selenic.com
parents:
diff changeset
    59
Got arguments 1:user@dummy 2:hg -R remote serve --stdio 3: 4: 5:
1032a505488c Add a simple dummy ssh test
mpm@selenic.com
parents:
diff changeset
    60
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
    61
Got arguments 1:user@dummy 2:hg -R local serve --stdio 3: 4: 5:
1110
1032a505488c Add a simple dummy ssh test
mpm@selenic.com
parents:
diff changeset
    62
Got arguments 1:user@dummy 2:hg -R remote serve --stdio 3: 4: 5: