##// END OF EJS Templates
Fix up test results...
mpm@selenic.com -
r775:122449dd default
parent child Browse files
Show More
@@ -1,6 +1,6 b''
1 + hg clone http://localhost:20059/ copy
1 + hg clone http://localhost:20059/ copy
2 requesting all changes
2 requesting all changes
3 abort: error 111: Connection refused
3 abort: error: Connection refused
4 + echo 255
4 + echo 255
5 255
5 255
6 + ls copy
6 + ls copy
@@ -4,7 +4,7 b' abort: repository a/.hg not found!'
4 255
4 255
5 + hg clone http://127.0.0.1:3121/a b
5 + hg clone http://127.0.0.1:3121/a b
6 requesting all changes
6 requesting all changes
7 abort: error 111: Connection refused
7 abort: error: Connection refused
8 + echo 255
8 + echo 255
9 255
9 255
10 + rm -rf b
10 + rm -rf b
@@ -14,8 +14,8 b' pulling from ../test1'
14 requesting all changes
14 requesting all changes
15 adding changesets
15 adding changesets
16 adding manifests
16 adding manifests
17 adding file revisions
17 adding file changes
18 modified 2 files, added 1 changesets and 2 new revisions
18 added 1 changesets with 2 changes to 2 files
19 (run 'hg update' to get a working copy)
19 (run 'hg update' to get a working copy)
20 + hg co
20 + hg co
21 + chmod +x a
21 + chmod +x a
@@ -28,8 +28,8 b' pulling from ../test2'
28 searching for changes
28 searching for changes
29 adding changesets
29 adding changesets
30 adding manifests
30 adding manifests
31 adding file revisions
31 adding file changes
32 modified 1 files, added 1 changesets and 1 new revisions
32 added 1 changesets with 1 changes to 1 files
33 (run 'hg update' to get a working copy)
33 (run 'hg update' to get a working copy)
34 + hg heads
34 + hg heads
35 changeset: 2:3ef54330565526bebf37a0d9bf540c283fd133a1
35 changeset: 2:3ef54330565526bebf37a0d9bf540c283fd133a1
@@ -6,5 +6,6 b''
6 + hg add b
6 + hg add b
7 + rm b
7 + rm b
8 + hg commit -A '-mcomment #1' -d '0 0'
8 + hg commit -A '-mcomment #1' -d '0 0'
9 adding .out
9 removing b
10 removing b
10 b never committed!
11 b never committed!
@@ -27,8 +27,8 b' pulling from ../B1'
27 searching for changes
27 searching for changes
28 adding changesets
28 adding changesets
29 adding manifests
29 adding manifests
30 adding file revisions
30 adding file changes
31 modified 1 files, added 1 changesets and 1 new revisions
31 added 1 changesets with 1 changes to 1 files
32 (run 'hg update' to get a working copy)
32 (run 'hg update' to get a working copy)
33 + hg update -m
33 + hg update -m
34 + hg commit -m 'commit test' -d '0 0'
34 + hg commit -m 'commit test' -d '0 0'
@@ -42,8 +42,8 b' pulling from ../A2'
42 searching for changes
42 searching for changes
43 adding changesets
43 adding changesets
44 adding manifests
44 adding manifests
45 adding file revisions
45 adding file changes
46 modified 0 files, added 1 changesets and 0 new revisions
46 added 1 changesets with 0 changes to 0 files
47 (run 'hg update' to get a working copy)
47 (run 'hg update' to get a working copy)
48 + hg update -m
48 + hg update -m
49 + hg commit -m 'commit test' -d '0 0'
49 + hg commit -m 'commit test' -d '0 0'
@@ -7,8 +7,8 b' 1 files, 1 changesets, 1 total revisions'
7 requesting all changes
7 requesting all changes
8 adding changesets
8 adding changesets
9 adding manifests
9 adding manifests
10 adding file revisions
10 adding file changes
11 modified 1 files, added 1 changesets and 1 new revisions
11 added 1 changesets with 1 changes to 1 files
12 checking changesets
12 checking changesets
13 checking manifests
13 checking manifests
14 crosschecking files in changesets and manifests
14 crosschecking files in changesets and manifests
@@ -22,8 +22,8 b' pulling from ../branch'
22 searching for changes
22 searching for changes
23 adding changesets
23 adding changesets
24 adding manifests
24 adding manifests
25 adding file revisions
25 adding file changes
26 modified 1 files, added 1 changesets and 1 new revisions
26 added 1 changesets with 1 changes to 1 files
27 (run 'hg update' to get a working copy)
27 (run 'hg update' to get a working copy)
28 + hg verify
28 + hg verify
29 checking changesets
29 checking changesets
@@ -3,8 +3,8 b' searching for changes'
3 warning: pulling from an unrelated repository!
3 warning: pulling from an unrelated repository!
4 adding changesets
4 adding changesets
5 adding manifests
5 adding manifests
6 adding file revisions
6 adding file changes
7 modified 1 files, added 1 changesets and 1 new revisions
7 added 1 changesets with 1 changes to 1 files
8 (run 'hg update' to get a working copy)
8 (run 'hg update' to get a working copy)
9 changeset: 1:9a79c33a9db37480e40fbd2a65d62ebd2a3c441c
9 changeset: 1:9a79c33a9db37480e40fbd2a65d62ebd2a3c441c
10 tag: tip
10 tag: tip
@@ -10,7 +10,7 b' adding a'
10 + hg up
10 + hg up
11 + echo abc
11 + echo abc
12 + hg diff
12 + hg diff
13 + sed 's/\(\(---\|+++\).*\)\t.*/\1/'
13 + sed 's/\(\(---\|+++\) [^ \t]*\)[ \t].*/\1/'
14 diff -r c19d34741b0a a
14 diff -r c19d34741b0a a
15 --- a/a
15 --- a/a
16 +++ b/a
16 +++ b/a
@@ -69,7 +69,7 b' 1'
69
69
70
70
71 + hg diff
71 + hg diff
72 + sed 's/\(\(---\|+++\).*\)\t.*/\1/'
72 + sed 's/\(\(---\|+++\) [^ \t]*\)[ \t].*/\1/'
73 diff -r 1e71731e6fbb a
73 diff -r 1e71731e6fbb a
74 --- a/a
74 --- a/a
75 +++ b/a
75 +++ b/a
General Comments 0
You need to be logged in to leave comments. Login now