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