Show More
@@ -47,7 +47,7 b' but there is no cache file for it. So, ' | |||||
47 |
|
47 | |||
48 | $ hg update -r0 |
|
48 | $ hg update -r0 | |
49 | getting changed largefiles |
|
49 | getting changed largefiles | |
50 | large: largefile 7f7097b041ccf68cc5561e9600da4655d21c6d18 not available from file:$TESTTMP/mirror |
|
50 | large: largefile 7f7097b041ccf68cc5561e9600da4655d21c6d18 not available from file:$TESTTMP/mirror (glob) | |
51 | 0 largefiles updated, 0 removed |
|
51 | 0 largefiles updated, 0 removed | |
52 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
52 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
53 | $ hg status |
|
53 | $ hg status | |
@@ -64,7 +64,7 b' Update working directory to tip, again.' | |||||
64 |
|
64 | |||
65 | $ hg update -r0 |
|
65 | $ hg update -r0 | |
66 | getting changed largefiles |
|
66 | getting changed largefiles | |
67 | large: largefile 7f7097b041ccf68cc5561e9600da4655d21c6d18 not available from file:$TESTTMP/mirror |
|
67 | large: largefile 7f7097b041ccf68cc5561e9600da4655d21c6d18 not available from file:$TESTTMP/mirror (glob) | |
68 | 0 largefiles updated, 0 removed |
|
68 | 0 largefiles updated, 0 removed | |
69 | 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 | |
70 | $ hg status |
|
70 | $ hg status |
@@ -1278,7 +1278,7 b' Update to revision with missing largefil' | |||||
1278 | $ rm ${USERCACHE}/7838695e10da2bb75ac1156565f40a2595fa2fa0 |
|
1278 | $ rm ${USERCACHE}/7838695e10da2bb75ac1156565f40a2595fa2fa0 | |
1279 | $ hg up -r 6 |
|
1279 | $ hg up -r 6 | |
1280 | getting changed largefiles |
|
1280 | getting changed largefiles | |
1281 | large3: largefile 7838695e10da2bb75ac1156565f40a2595fa2fa0 not available from file:$TESTTMP/d |
|
1281 | large3: largefile 7838695e10da2bb75ac1156565f40a2595fa2fa0 not available from file:$TESTTMP/d (glob) | |
1282 | 1 largefiles updated, 2 removed |
|
1282 | 1 largefiles updated, 2 removed | |
1283 | 4 files updated, 0 files merged, 2 files removed, 0 files unresolved |
|
1283 | 4 files updated, 0 files merged, 2 files removed, 0 files unresolved | |
1284 | $ rm normal3 |
|
1284 | $ rm normal3 | |
@@ -1299,7 +1299,7 b' Update to revision with missing largefil' | |||||
1299 | ! normal3 |
|
1299 | ! normal3 | |
1300 | $ hg up -Cr. |
|
1300 | $ hg up -Cr. | |
1301 | getting changed largefiles |
|
1301 | getting changed largefiles | |
1302 | large3: largefile 7838695e10da2bb75ac1156565f40a2595fa2fa0 not available from file:$TESTTMP/d |
|
1302 | large3: largefile 7838695e10da2bb75ac1156565f40a2595fa2fa0 not available from file:$TESTTMP/d (glob) | |
1303 | 0 largefiles updated, 0 removed |
|
1303 | 0 largefiles updated, 0 removed | |
1304 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
1304 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
1305 | $ hg st |
|
1305 | $ hg st | |
@@ -1321,7 +1321,7 b' Merge with revision with missing largefi' | |||||
1321 | 4 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
1321 | 4 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
1322 | (branch merge, don't forget to commit) |
|
1322 | (branch merge, don't forget to commit) | |
1323 | getting changed largefiles |
|
1323 | getting changed largefiles | |
1324 | large3: largefile 7838695e10da2bb75ac1156565f40a2595fa2fa0 not available from file:$TESTTMP/d |
|
1324 | large3: largefile 7838695e10da2bb75ac1156565f40a2595fa2fa0 not available from file:$TESTTMP/d (glob) | |
1325 | 1 largefiles updated, 0 removed |
|
1325 | 1 largefiles updated, 0 removed | |
1326 |
|
1326 | |||
1327 | $ hg rollback -q |
|
1327 | $ hg rollback -q |
@@ -343,7 +343,7 b' Ensure the abort message is useful if a ' | |||||
343 | $ rm largefiles-repo/.hg/largefiles/* |
|
343 | $ rm largefiles-repo/.hg/largefiles/* | |
344 | $ hg lfconvert --to-normal issue3519 normalized3519 |
|
344 | $ hg lfconvert --to-normal issue3519 normalized3519 | |
345 | initializing destination normalized3519 |
|
345 | initializing destination normalized3519 | |
346 | large: largefile 2e000fa7e85759c7f4c254d4d9c33ef481e459a7 not available from file:$TESTTMP/largefiles-repo |
|
346 | large: largefile 2e000fa7e85759c7f4c254d4d9c33ef481e459a7 not available from file:$TESTTMP/largefiles-repo (glob) | |
347 | abort: missing largefile 'large' from revision d4892ec57ce212905215fad1d9018f56b99202ad |
|
347 | abort: missing largefile 'large' from revision d4892ec57ce212905215fad1d9018f56b99202ad | |
348 | [255] |
|
348 | [255] | |
349 |
|
349 |
@@ -289,7 +289,7 b' push' | |||||
289 | committing subrepository t |
|
289 | committing subrepository t | |
290 | $ hg push |
|
290 | $ hg push | |
291 | pushing to $TESTTMP/t (glob) |
|
291 | pushing to $TESTTMP/t (glob) | |
292 | no changes made to subrepo s/ss since last push to $TESTTMP/t/s/ss |
|
292 | no changes made to subrepo s/ss since last push to $TESTTMP/t/s/ss (glob) | |
293 | no changes made to subrepo s since last push to $TESTTMP/t/s |
|
293 | no changes made to subrepo s since last push to $TESTTMP/t/s | |
294 | pushing subrepo t to $TESTTMP/t/t |
|
294 | pushing subrepo t to $TESTTMP/t/t | |
295 | searching for changes |
|
295 | searching for changes | |
@@ -310,7 +310,7 b' push -f' | |||||
310 | committing subrepository s |
|
310 | committing subrepository s | |
311 | $ hg push |
|
311 | $ hg push | |
312 | pushing to $TESTTMP/t (glob) |
|
312 | pushing to $TESTTMP/t (glob) | |
313 | no changes made to subrepo s/ss since last push to $TESTTMP/t/s/ss |
|
313 | no changes made to subrepo s/ss since last push to $TESTTMP/t/s/ss (glob) | |
314 | pushing subrepo s to $TESTTMP/t/s |
|
314 | pushing subrepo s to $TESTTMP/t/s | |
315 | searching for changes |
|
315 | searching for changes | |
316 | abort: push creates new remote head 12a213df6fa9! (in subrepo s) |
|
316 | abort: push creates new remote head 12a213df6fa9! (in subrepo s) | |
@@ -341,7 +341,7 b' check that unmodified subrepos are not p' | |||||
341 | $ hg clone . ../tcc |
|
341 | $ hg clone . ../tcc | |
342 | updating to branch default |
|
342 | updating to branch default | |
343 | cloning subrepo s from $TESTTMP/tc/s |
|
343 | cloning subrepo s from $TESTTMP/tc/s | |
344 | cloning subrepo s/ss from $TESTTMP/tc/s/ss |
|
344 | cloning subrepo s/ss from $TESTTMP/tc/s/ss (glob) | |
345 | cloning subrepo t from $TESTTMP/tc/t |
|
345 | cloning subrepo t from $TESTTMP/tc/t | |
346 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
346 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
347 |
|
347 | |||
@@ -349,7 +349,7 b' the subrepos on the new clone have nothi' | |||||
349 |
|
349 | |||
350 | $ hg push -R ../tcc . |
|
350 | $ hg push -R ../tcc . | |
351 | pushing to . |
|
351 | pushing to . | |
352 | no changes made to subrepo s/ss since last push to s/ss |
|
352 | no changes made to subrepo s/ss since last push to s/ss (glob) | |
353 | no changes made to subrepo s since last push to s |
|
353 | no changes made to subrepo s since last push to s | |
354 | no changes made to subrepo t since last push to t |
|
354 | no changes made to subrepo t since last push to t | |
355 | searching for changes |
|
355 | searching for changes | |
@@ -361,7 +361,7 b' because they were never explicitly pushe' | |||||
361 |
|
361 | |||
362 | $ hg push ../tcc |
|
362 | $ hg push ../tcc | |
363 | pushing to ../tcc |
|
363 | pushing to ../tcc | |
364 | pushing subrepo s/ss to ../tcc/s/ss |
|
364 | pushing subrepo s/ss to ../tcc/s/ss (glob) | |
365 | searching for changes |
|
365 | searching for changes | |
366 | no changes found |
|
366 | no changes found | |
367 | pushing subrepo s to ../tcc/s |
|
367 | pushing subrepo s to ../tcc/s | |
@@ -378,7 +378,7 b' after push their stores become clean' | |||||
378 |
|
378 | |||
379 | $ hg push ../tcc |
|
379 | $ hg push ../tcc | |
380 | pushing to ../tcc |
|
380 | pushing to ../tcc | |
381 | no changes made to subrepo s/ss since last push to ../tcc/s/ss |
|
381 | no changes made to subrepo s/ss since last push to ../tcc/s/ss (glob) | |
382 | no changes made to subrepo s since last push to ../tcc/s |
|
382 | no changes made to subrepo s since last push to ../tcc/s | |
383 | no changes made to subrepo t since last push to ../tcc/t |
|
383 | no changes made to subrepo t since last push to ../tcc/t | |
384 | searching for changes |
|
384 | searching for changes | |
@@ -392,7 +392,7 b' its working directory does not make its ' | |||||
392 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
392 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
393 | $ hg push |
|
393 | $ hg push | |
394 | pushing to $TESTTMP/t |
|
394 | pushing to $TESTTMP/t | |
395 | no changes made to subrepo s/ss since last push to $TESTTMP/t/s/ss |
|
395 | no changes made to subrepo s/ss since last push to $TESTTMP/t/s/ss (glob) | |
396 | no changes made to subrepo s since last push to $TESTTMP/t/s |
|
396 | no changes made to subrepo s since last push to $TESTTMP/t/s | |
397 | no changes made to subrepo t since last push to $TESTTMP/t/t |
|
397 | no changes made to subrepo t since last push to $TESTTMP/t/t | |
398 | searching for changes |
|
398 | searching for changes | |
@@ -401,7 +401,7 b' its working directory does not make its ' | |||||
401 | $ echo foo >> s/a |
|
401 | $ echo foo >> s/a | |
402 | $ hg push |
|
402 | $ hg push | |
403 | pushing to $TESTTMP/t |
|
403 | pushing to $TESTTMP/t | |
404 | no changes made to subrepo s/ss since last push to $TESTTMP/t/s/ss |
|
404 | no changes made to subrepo s/ss since last push to $TESTTMP/t/s/ss (glob) | |
405 | no changes made to subrepo s since last push to $TESTTMP/t/s |
|
405 | no changes made to subrepo s since last push to $TESTTMP/t/s | |
406 | no changes made to subrepo t since last push to $TESTTMP/t/t |
|
406 | no changes made to subrepo t since last push to $TESTTMP/t/t | |
407 | searching for changes |
|
407 | searching for changes | |
@@ -416,7 +416,7 b' committing into a subrepo makes its stor' | |||||
416 | $ hg -R s/ss commit -m 'test dirty store detection' |
|
416 | $ hg -R s/ss commit -m 'test dirty store detection' | |
417 | $ hg push |
|
417 | $ hg push | |
418 | pushing to $TESTTMP/t |
|
418 | pushing to $TESTTMP/t | |
419 | pushing subrepo s/ss to $TESTTMP/t/s/ss |
|
419 | pushing subrepo s/ss to $TESTTMP/t/s/ss (glob) | |
420 | searching for changes |
|
420 | searching for changes | |
421 | adding changesets |
|
421 | adding changesets | |
422 | adding manifests |
|
422 | adding manifests | |
@@ -432,7 +432,7 b' a subrepo store may be clean versus one ' | |||||
432 |
|
432 | |||
433 | $ hg push |
|
433 | $ hg push | |
434 | pushing to $TESTTMP/t |
|
434 | pushing to $TESTTMP/t | |
435 | no changes made to subrepo s/ss since last push to $TESTTMP/t/s/ss |
|
435 | no changes made to subrepo s/ss since last push to $TESTTMP/t/s/ss (glob) | |
436 | no changes made to subrepo s since last push to $TESTTMP/t/s |
|
436 | no changes made to subrepo s since last push to $TESTTMP/t/s | |
437 | no changes made to subrepo t since last push to $TESTTMP/t/t |
|
437 | no changes made to subrepo t since last push to $TESTTMP/t/t | |
438 | searching for changes |
|
438 | searching for changes | |
@@ -467,7 +467,7 b' KeyError' | |||||
467 | $ hg backout ".^" |
|
467 | $ hg backout ".^" | |
468 | reverting .hgsubstate |
|
468 | reverting .hgsubstate | |
469 | reverting subrepo s |
|
469 | reverting subrepo s | |
470 | reverting s/a |
|
470 | reverting s/a (glob) | |
471 | reverting subrepo ss |
|
471 | reverting subrepo ss | |
472 | reverting subrepo t |
|
472 | reverting subrepo t | |
473 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
473 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
General Comments 0
You need to be logged in to leave comments.
Login now