##// END OF EJS Templates
test-subrepo-recursion: fix output on non-hardlink systems...
Augie Fackler -
r24613:f8bc3de9 default
parent child Browse files
Show More
@@ -343,6 +343,7 b' Test archiving to zip file (unzip output'
343 Test archiving a revision that references a subrepo that is not yet
343 Test archiving a revision that references a subrepo that is not yet
344 cloned:
344 cloned:
345
345
346 #if hardlink
346 $ hg clone -U . ../empty
347 $ hg clone -U . ../empty
347 \r (no-eol) (esc)
348 \r (no-eol) (esc)
348 linking [ <=> ] 1\r (no-eol) (esc)
349 linking [ <=> ] 1\r (no-eol) (esc)
@@ -354,7 +355,14 b' cloned:'
354 linking [ <=> ] 7\r (no-eol) (esc)
355 linking [ <=> ] 7\r (no-eol) (esc)
355 linking [ <=> ] 8\r (no-eol) (esc)
356 linking [ <=> ] 8\r (no-eol) (esc)
356 \r (no-eol) (esc)
357 \r (no-eol) (esc)
358 #else
359 $ hg clone -U . ../empty
360 \r (no-eol) (esc)
361 linking [ <=> ] 1 (no-eol)
362 #endif
363
357 $ cd ../empty
364 $ cd ../empty
365 #if hardlink
358 $ hg archive --subrepos -r tip ../archive.tar.gz
366 $ hg archive --subrepos -r tip ../archive.tar.gz
359 \r (no-eol) (esc)
367 \r (no-eol) (esc)
360 archiving [ ] 0/3\r (no-eol) (esc)
368 archiving [ ] 0/3\r (no-eol) (esc)
@@ -402,6 +410,29 b' cloned:'
402 \r (no-eol) (esc)
410 \r (no-eol) (esc)
403 cloning subrepo foo from $TESTTMP/repo/foo
411 cloning subrepo foo from $TESTTMP/repo/foo
404 cloning subrepo foo/bar from $TESTTMP/repo/foo/bar (glob)
412 cloning subrepo foo/bar from $TESTTMP/repo/foo/bar (glob)
413 #else
414 Note there's a slight output glitch on non-hardlink systems: the last
415 "linking" progress topic never gets closed, leading to slight output corruption on that platform.
416 $ hg archive --subrepos -r tip ../archive.tar.gz
417 \r (no-eol) (esc)
418 archiving [ ] 0/3\r (no-eol) (esc)
419 archiving [ ] 0/3\r (no-eol) (esc)
420 archiving [=============> ] 1/3\r (no-eol) (esc)
421 archiving [=============> ] 1/3\r (no-eol) (esc)
422 archiving [===========================> ] 2/3\r (no-eol) (esc)
423 archiving [===========================> ] 2/3\r (no-eol) (esc)
424 archiving [==========================================>] 3/3\r (no-eol) (esc)
425 archiving [==========================================>] 3/3\r (no-eol) (esc)
426 \r (no-eol) (esc)
427 \r (no-eol) (esc)
428 linking [ <=> ] 1\r (no-eol) (esc)
429 \r (no-eol) (esc)
430 \r (no-eol) (esc)
431 \r (no-eol) (esc)
432 \r (no-eol) (esc)
433 linking [ <=> ] 1cloning subrepo foo from $TESTTMP/repo/foo
434 cloning subrepo foo/bar from $TESTTMP/repo/foo/bar (glob)
435 #endif
405
436
406 The newly cloned subrepos contain no working copy:
437 The newly cloned subrepos contain no working copy:
407
438
General Comments 0
You need to be logged in to leave comments. Login now