equal
deleted
inserted
replaced
7 $ hg unbundle "$TESTDIR/bundles/remote.hg" |
7 $ hg unbundle "$TESTDIR/bundles/remote.hg" |
8 adding changesets |
8 adding changesets |
9 adding manifests |
9 adding manifests |
10 adding file changes |
10 adding file changes |
11 added 9 changesets with 7 changes to 4 files (+1 heads) |
11 added 9 changesets with 7 changes to 4 files (+1 heads) |
|
12 new changesets bfaf4b5cbf01:916f1afdef90 |
12 (run 'hg heads' to see heads, 'hg merge' to merge) |
13 (run 'hg heads' to see heads, 'hg merge' to merge) |
13 $ hg up tip |
14 $ hg up tip |
14 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
15 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
15 $ cd .. |
16 $ cd .. |
16 |
17 |
25 > done |
26 > done |
26 adding changesets |
27 adding changesets |
27 adding manifests |
28 adding manifests |
28 adding file changes |
29 adding file changes |
29 added 1 changesets with 1 changes to 1 files |
30 added 1 changesets with 1 changes to 1 files |
|
31 new changesets bfaf4b5cbf01 |
30 updating to branch default |
32 updating to branch default |
31 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
33 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
32 checking changesets |
34 checking changesets |
33 checking manifests |
35 checking manifests |
34 crosschecking files in changesets and manifests |
36 crosschecking files in changesets and manifests |
36 1 files, 1 changesets, 1 total revisions |
38 1 files, 1 changesets, 1 total revisions |
37 adding changesets |
39 adding changesets |
38 adding manifests |
40 adding manifests |
39 adding file changes |
41 adding file changes |
40 added 2 changesets with 2 changes to 1 files |
42 added 2 changesets with 2 changes to 1 files |
|
43 new changesets bfaf4b5cbf01:21f32785131f |
41 updating to branch default |
44 updating to branch default |
42 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
45 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
43 checking changesets |
46 checking changesets |
44 checking manifests |
47 checking manifests |
45 crosschecking files in changesets and manifests |
48 crosschecking files in changesets and manifests |
47 1 files, 2 changesets, 2 total revisions |
50 1 files, 2 changesets, 2 total revisions |
48 adding changesets |
51 adding changesets |
49 adding manifests |
52 adding manifests |
50 adding file changes |
53 adding file changes |
51 added 3 changesets with 3 changes to 1 files |
54 added 3 changesets with 3 changes to 1 files |
|
55 new changesets bfaf4b5cbf01:4ce51a113780 |
52 updating to branch default |
56 updating to branch default |
53 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
57 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
54 checking changesets |
58 checking changesets |
55 checking manifests |
59 checking manifests |
56 crosschecking files in changesets and manifests |
60 crosschecking files in changesets and manifests |
58 1 files, 3 changesets, 3 total revisions |
62 1 files, 3 changesets, 3 total revisions |
59 adding changesets |
63 adding changesets |
60 adding manifests |
64 adding manifests |
61 adding file changes |
65 adding file changes |
62 added 4 changesets with 4 changes to 1 files |
66 added 4 changesets with 4 changes to 1 files |
|
67 new changesets bfaf4b5cbf01:93ee6ab32777 |
63 updating to branch default |
68 updating to branch default |
64 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
69 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
65 checking changesets |
70 checking changesets |
66 checking manifests |
71 checking manifests |
67 crosschecking files in changesets and manifests |
72 crosschecking files in changesets and manifests |
69 1 files, 4 changesets, 4 total revisions |
74 1 files, 4 changesets, 4 total revisions |
70 adding changesets |
75 adding changesets |
71 adding manifests |
76 adding manifests |
72 adding file changes |
77 adding file changes |
73 added 2 changesets with 2 changes to 1 files |
78 added 2 changesets with 2 changes to 1 files |
|
79 new changesets bfaf4b5cbf01:c70afb1ee985 |
74 updating to branch default |
80 updating to branch default |
75 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
81 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
76 checking changesets |
82 checking changesets |
77 checking manifests |
83 checking manifests |
78 crosschecking files in changesets and manifests |
84 crosschecking files in changesets and manifests |
80 1 files, 2 changesets, 2 total revisions |
86 1 files, 2 changesets, 2 total revisions |
81 adding changesets |
87 adding changesets |
82 adding manifests |
88 adding manifests |
83 adding file changes |
89 adding file changes |
84 added 3 changesets with 3 changes to 1 files |
90 added 3 changesets with 3 changes to 1 files |
|
91 new changesets bfaf4b5cbf01:f03ae5a9b979 |
85 updating to branch default |
92 updating to branch default |
86 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
93 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
87 checking changesets |
94 checking changesets |
88 checking manifests |
95 checking manifests |
89 crosschecking files in changesets and manifests |
96 crosschecking files in changesets and manifests |
91 1 files, 3 changesets, 3 total revisions |
98 1 files, 3 changesets, 3 total revisions |
92 adding changesets |
99 adding changesets |
93 adding manifests |
100 adding manifests |
94 adding file changes |
101 adding file changes |
95 added 4 changesets with 5 changes to 2 files |
102 added 4 changesets with 5 changes to 2 files |
|
103 new changesets bfaf4b5cbf01:095cb14b1b4d |
96 updating to branch default |
104 updating to branch default |
97 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
105 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
98 checking changesets |
106 checking changesets |
99 checking manifests |
107 checking manifests |
100 crosschecking files in changesets and manifests |
108 crosschecking files in changesets and manifests |
102 2 files, 4 changesets, 5 total revisions |
110 2 files, 4 changesets, 5 total revisions |
103 adding changesets |
111 adding changesets |
104 adding manifests |
112 adding manifests |
105 adding file changes |
113 adding file changes |
106 added 5 changesets with 6 changes to 3 files |
114 added 5 changesets with 6 changes to 3 files |
|
115 new changesets bfaf4b5cbf01:faa2e4234c7a |
107 updating to branch default |
116 updating to branch default |
108 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
117 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
109 checking changesets |
118 checking changesets |
110 checking manifests |
119 checking manifests |
111 crosschecking files in changesets and manifests |
120 crosschecking files in changesets and manifests |
113 3 files, 5 changesets, 6 total revisions |
122 3 files, 5 changesets, 6 total revisions |
114 adding changesets |
123 adding changesets |
115 adding manifests |
124 adding manifests |
116 adding file changes |
125 adding file changes |
117 added 5 changesets with 5 changes to 2 files |
126 added 5 changesets with 5 changes to 2 files |
|
127 new changesets bfaf4b5cbf01:916f1afdef90 |
118 updating to branch default |
128 updating to branch default |
119 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
129 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
120 checking changesets |
130 checking changesets |
121 checking manifests |
131 checking manifests |
122 crosschecking files in changesets and manifests |
132 crosschecking files in changesets and manifests |
128 searching for changes |
138 searching for changes |
129 adding changesets |
139 adding changesets |
130 adding manifests |
140 adding manifests |
131 adding file changes |
141 adding file changes |
132 added 4 changesets with 2 changes to 3 files (+1 heads) |
142 added 4 changesets with 2 changes to 3 files (+1 heads) |
|
143 new changesets c70afb1ee985:faa2e4234c7a |
133 (run 'hg heads' to see heads, 'hg merge' to merge) |
144 (run 'hg heads' to see heads, 'hg merge' to merge) |
134 $ hg verify |
145 $ hg verify |
135 checking changesets |
146 checking changesets |
136 checking manifests |
147 checking manifests |
137 crosschecking files in changesets and manifests |
148 crosschecking files in changesets and manifests |
144 searching for changes |
155 searching for changes |
145 adding changesets |
156 adding changesets |
146 adding manifests |
157 adding manifests |
147 adding file changes |
158 adding file changes |
148 added 1 changesets with 0 changes to 0 files (+1 heads) |
159 added 1 changesets with 0 changes to 0 files (+1 heads) |
|
160 new changesets c70afb1ee985 |
149 (run 'hg heads' to see heads, 'hg merge' to merge) |
161 (run 'hg heads' to see heads, 'hg merge' to merge) |
150 $ hg verify |
162 $ hg verify |
151 checking changesets |
163 checking changesets |
152 checking manifests |
164 checking manifests |
153 crosschecking files in changesets and manifests |
165 crosschecking files in changesets and manifests |
158 searching for changes |
170 searching for changes |
159 adding changesets |
171 adding changesets |
160 adding manifests |
172 adding manifests |
161 adding file changes |
173 adding file changes |
162 added 6 changesets with 5 changes to 4 files |
174 added 6 changesets with 5 changes to 4 files |
|
175 new changesets 4ce51a113780:916f1afdef90 |
163 (run 'hg update' to get a working copy) |
176 (run 'hg update' to get a working copy) |
164 $ cd .. |
177 $ cd .. |
165 $ cd test-2 |
178 $ cd test-2 |
166 $ hg pull -e "\"$PYTHON\" \"$TESTDIR/dummyssh\"" -r 5 ssh://user@dummy/remote |
179 $ hg pull -e "\"$PYTHON\" \"$TESTDIR/dummyssh\"" -r 5 ssh://user@dummy/remote |
167 pulling from ssh://user@dummy/remote |
180 pulling from ssh://user@dummy/remote |
168 searching for changes |
181 searching for changes |
169 adding changesets |
182 adding changesets |
170 adding manifests |
183 adding manifests |
171 adding file changes |
184 adding file changes |
172 added 2 changesets with 0 changes to 0 files (+1 heads) |
185 added 2 changesets with 0 changes to 0 files (+1 heads) |
|
186 new changesets c70afb1ee985:f03ae5a9b979 |
173 (run 'hg heads' to see heads, 'hg merge' to merge) |
187 (run 'hg heads' to see heads, 'hg merge' to merge) |
174 $ hg verify |
188 $ hg verify |
175 checking changesets |
189 checking changesets |
176 checking manifests |
190 checking manifests |
177 crosschecking files in changesets and manifests |
191 crosschecking files in changesets and manifests |
182 searching for changes |
196 searching for changes |
183 adding changesets |
197 adding changesets |
184 adding manifests |
198 adding manifests |
185 adding file changes |
199 adding file changes |
186 added 4 changesets with 4 changes to 4 files |
200 added 4 changesets with 4 changes to 4 files |
|
201 new changesets 93ee6ab32777:916f1afdef90 |
187 (run 'hg update' to get a working copy) |
202 (run 'hg update' to get a working copy) |
188 $ hg verify |
203 $ hg verify |
189 checking changesets |
204 checking changesets |
190 checking manifests |
205 checking manifests |
191 crosschecking files in changesets and manifests |
206 crosschecking files in changesets and manifests |