equal
deleted
inserted
replaced
87 $ cd narrow |
87 $ cd narrow |
88 $ hg tracked --addinclude wider/f |
88 $ hg tracked --addinclude wider/f |
89 comparing with ssh://user@dummy/master |
89 comparing with ssh://user@dummy/master |
90 searching for changes |
90 searching for changes |
91 no changes found |
91 no changes found |
|
92 adding changesets |
|
93 adding manifests |
|
94 adding file changes |
|
95 added 0 changesets with 0 changes to 1 files |
92 3 local changesets published |
96 3 local changesets published |
93 $ hg tracked |
97 $ hg tracked |
94 I path:inside |
98 I path:inside |
95 |
99 |
96 Pull down the newly added upstream revision. |
100 Pull down the newly added upstream revision. |
139 |
143 |
140 $ hg tracked --addinclude widest |
144 $ hg tracked --addinclude widest |
141 comparing with ssh://user@dummy/master |
145 comparing with ssh://user@dummy/master |
142 searching for changes |
146 searching for changes |
143 no changes found |
147 no changes found |
|
148 adding changesets |
|
149 adding manifests |
|
150 adding file changes |
|
151 added 0 changesets with 4 changes to 2 files |
144 5 local changesets published |
152 5 local changesets published |
145 abort: path ends in directory separator: widest/ |
153 abort: path ends in directory separator: widest/ |
146 [255] |
154 [255] |
147 $ hg tracked |
155 $ hg tracked |
148 I path:inside |
156 I path:inside |
245 *: add d0/f (glob) |
253 *: add d0/f (glob) |
246 $ hg tracked --addinclude d1 |
254 $ hg tracked --addinclude d1 |
247 comparing with ssh://user@dummy/upstream |
255 comparing with ssh://user@dummy/upstream |
248 searching for changes |
256 searching for changes |
249 no changes found |
257 no changes found |
|
258 adding changesets |
|
259 adding manifests |
|
260 adding file changes |
|
261 added 0 changesets with 1 changes to 5 files |
250 11 local changesets published |
262 11 local changesets published |
251 abort: path ends in directory separator: d1/ |
263 abort: path ends in directory separator: d1/ |
252 [255] |
264 [255] |
253 $ hg tracked |
265 $ hg tracked |
254 I path:d0 |
266 I path:d0 |
272 |
284 |
273 $ hg verify |
285 $ hg verify |
274 checking changesets |
286 checking changesets |
275 checking manifests |
287 checking manifests |
276 checking directory manifests |
288 checking directory manifests |
|
289 warning: orphan data file 'meta/d1/00manifest.i' |
277 crosschecking files in changesets and manifests |
290 crosschecking files in changesets and manifests |
278 checking files |
291 checking files |
|
292 warning: orphan data file 'data/d1/f.i' |
279 4 files, 11 changesets, 4 total revisions |
293 4 files, 11 changesets, 4 total revisions |
|
294 2 warnings encountered! |
280 |
295 |
281 Widening preserves parent of local commit |
296 Widening preserves parent of local commit |
282 |
297 |
283 $ cd .. |
298 $ cd .. |
284 $ hg clone -q --narrow ssh://user@dummy/upstream narrow3 --include d2 -r 2 |
299 $ hg clone -q --narrow ssh://user@dummy/upstream narrow3 --include d2 -r 2 |
338 $ hg bookmarks bookmark |
353 $ hg bookmarks bookmark |
339 $ hg --config hooks.pretxnchangegroup.bad=false tracked --addinclude d1 |
354 $ hg --config hooks.pretxnchangegroup.bad=false tracked --addinclude d1 |
340 comparing with ssh://user@dummy/upstream |
355 comparing with ssh://user@dummy/upstream |
341 searching for changes |
356 searching for changes |
342 no changes found |
357 no changes found |
|
358 adding changesets |
|
359 adding manifests |
|
360 adding file changes |
|
361 added 0 changesets with 1 changes to 2 files |
343 11 local changesets published |
362 11 local changesets published |
344 abort: path ends in directory separator: d1/ |
363 abort: path ends in directory separator: d1/ |
345 [255] |
364 [255] |
346 $ hg log -T "{if(ellipsis, '...')}{rev}: {desc}\n" |
365 $ hg log -T "{if(ellipsis, '...')}{rev}: {desc}\n" |
347 11: local |
366 11: local |