294 X * externals (glob) |
294 X * externals (glob) |
295 ? * f1 (glob) |
295 ? * f1 (glob) |
296 ? * f2 (glob) |
296 ? * f2 (glob) |
297 |
297 |
298 Performing status on external item at 'externals' |
298 Performing status on external item at 'externals' |
|
299 |
|
300 Sticky subrepositories, no changes |
|
301 $ cd $TESTTMP/sub/t |
|
302 $ hg id -n |
|
303 2 |
|
304 $ cd s |
|
305 $ svnversion |
|
306 3 |
|
307 $ cd .. |
|
308 $ hg update 1 |
|
309 U $TESTTMP/sub/t/s/alpha |
|
310 |
|
311 Fetching external item into '$TESTTMP/sub/t/s/externals' |
|
312 Checked out external at revision 1. |
|
313 |
|
314 Checked out revision 2. |
|
315 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
316 $ hg id -n |
|
317 1 |
|
318 $ cd s |
|
319 $ svnversion |
|
320 2 |
|
321 $ cd .. |
|
322 |
|
323 Sticky subrepositorys, file changes |
|
324 $ touch s/f1 |
|
325 $ cd s |
|
326 $ svn add f1 |
|
327 A f1 |
|
328 $ cd .. |
|
329 $ hg id -n |
|
330 1 |
|
331 $ cd s |
|
332 $ svnversion |
|
333 2M |
|
334 $ cd .. |
|
335 $ hg update tip |
|
336 subrepository sources for s differ |
|
337 use (l)ocal source (2) or (r)emote source (3)? |
|
338 l |
|
339 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
340 $ hg id -n |
|
341 2+ |
|
342 $ cd s |
|
343 $ svnversion |
|
344 2M |
|
345 $ cd .. |
|
346 $ hg update --clean tip |
|
347 U $TESTTMP/sub/t/s/alpha |
|
348 |
|
349 Fetching external item into '$TESTTMP/sub/t/s/externals' |
|
350 Checked out external at revision 1. |
|
351 |
|
352 Checked out revision 3. |
|
353 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
354 |
|
355 Sticky subrepository, revision updates |
|
356 $ hg id -n |
|
357 2 |
|
358 $ cd s |
|
359 $ svnversion |
|
360 3 |
|
361 $ cd .. |
|
362 $ cd s |
|
363 $ svn update -r 1 |
|
364 U alpha |
|
365 U . |
|
366 |
|
367 Fetching external item into 'externals' |
|
368 Updated external to revision 1. |
|
369 |
|
370 Updated to revision 1. |
|
371 $ cd .. |
|
372 $ hg update 1 |
|
373 subrepository sources for s differ (in checked out version) |
|
374 use (l)ocal source (1) or (r)emote source (2)? |
|
375 l |
|
376 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
377 $ hg id -n |
|
378 1+ |
|
379 $ cd s |
|
380 $ svnversion |
|
381 1 |
|
382 $ cd .. |
|
383 |
|
384 Sticky subrepository, file changes and revision updates |
|
385 $ touch s/f1 |
|
386 $ cd s |
|
387 $ svn add f1 |
|
388 A f1 |
|
389 $ svnversion |
|
390 1M |
|
391 $ cd .. |
|
392 $ hg id -n |
|
393 1+ |
|
394 $ hg update tip |
|
395 subrepository sources for s differ |
|
396 use (l)ocal source (1) or (r)emote source (3)? |
|
397 l |
|
398 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
399 $ hg id -n |
|
400 2 |
|
401 $ cd s |
|
402 $ svnversion |
|
403 1M |
|
404 $ cd .. |
|
405 |
|
406 Sticky repository, update --clean |
|
407 $ hg update --clean tip |
|
408 U $TESTTMP/sub/t/s/alpha |
|
409 U $TESTTMP/sub/t/s |
|
410 |
|
411 Fetching external item into '$TESTTMP/sub/t/s/externals' |
|
412 Checked out external at revision 1. |
|
413 |
|
414 Checked out revision 3. |
|
415 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
416 $ hg id -n |
|
417 2 |
|
418 $ cd s |
|
419 $ svnversion |
|
420 3 |
|
421 $ cd .. |
|
422 |
|
423 Test subrepo already at intended revision: |
|
424 $ cd s |
|
425 $ svn update -r 2 |
|
426 U alpha |
|
427 |
|
428 Fetching external item into 'externals' |
|
429 Updated external to revision 1. |
|
430 |
|
431 Updated to revision 2. |
|
432 $ cd .. |
|
433 $ hg update 1 |
|
434 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
435 $ hg id -n |
|
436 1+ |
|
437 $ cd s |
|
438 $ svnversion |
|
439 2 |
|
440 $ cd .. |