Show More
@@ -370,6 +370,13 b' revisions (this was a very bad bug that ' | |||||
370 | $ echo large6-modified > sub2/large6 |
|
370 | $ echo large6-modified > sub2/large6 | |
371 | $ echo normal4-modified > sub/normal4 |
|
371 | $ echo normal4-modified > sub/normal4 | |
372 | $ hg commit -m "modify normal file largefile in repo d" |
|
372 | $ hg commit -m "modify normal file largefile in repo d" | |
|
373 | $ cd .. | |||
|
374 | $ hg clone d e | |||
|
375 | updating to branch default | |||
|
376 | 5 files updated, 0 files merged, 0 files removed, 0 files unresolved | |||
|
377 | getting changed largefiles | |||
|
378 | 3 largefiles updated, 0 removed | |||
|
379 | $ cd d | |||
373 |
$ |
|
380 | $ hg pull --rebase ../b | |
374 | pulling from ../b |
|
381 | pulling from ../b | |
375 | searching for changes |
|
382 | searching for changes | |
@@ -443,3 +450,170 b' revisions (this was a very bad bug that ' | |||||
443 | large6-modified |
|
450 | large6-modified | |
444 | $ cat sub2/large7 |
|
451 | $ cat sub2/large7 | |
445 | large7 |
|
452 | large7 | |
|
453 | $ cd ../e | |||
|
454 | $ hg pull ../b | |||
|
455 | pulling from ../b | |||
|
456 | searching for changes | |||
|
457 | adding changesets | |||
|
458 | adding manifests | |||
|
459 | adding file changes | |||
|
460 | added 1 changesets with 2 changes to 2 files (+1 heads) | |||
|
461 | (run 'hg heads' to see heads, 'hg merge' to merge) | |||
|
462 | $ hg rebase | |||
|
463 | getting changed largefiles | |||
|
464 | 1 largefiles updated, 0 removed | |||
|
465 | saved backup bundle to $TESTTMP/e/.hg/strip-backup/f574fb32bb45-backup.hg | |||
|
466 | $ hg log | |||
|
467 | changeset: 9:598410d3eb9a | |||
|
468 | tag: tip | |||
|
469 | user: test | |||
|
470 | date: Thu Jan 01 00:00:00 1970 +0000 | |||
|
471 | summary: modify normal file largefile in repo d | |||
|
472 | ||||
|
473 | changeset: 8:a381d2c8c80e | |||
|
474 | user: test | |||
|
475 | date: Thu Jan 01 00:00:00 1970 +0000 | |||
|
476 | summary: modify normal file and largefile in repo b | |||
|
477 | ||||
|
478 | changeset: 7:daea875e9014 | |||
|
479 | user: test | |||
|
480 | date: Thu Jan 01 00:00:00 1970 +0000 | |||
|
481 | summary: add/edit more largefiles | |||
|
482 | ||||
|
483 | changeset: 6:4355d653f84f | |||
|
484 | user: test | |||
|
485 | date: Thu Jan 01 00:00:00 1970 +0000 | |||
|
486 | summary: edit files yet again | |||
|
487 | ||||
|
488 | changeset: 5:9d5af5072dbd | |||
|
489 | user: test | |||
|
490 | date: Thu Jan 01 00:00:00 1970 +0000 | |||
|
491 | summary: edit files again | |||
|
492 | ||||
|
493 | changeset: 4:74c02385b94c | |||
|
494 | user: test | |||
|
495 | date: Thu Jan 01 00:00:00 1970 +0000 | |||
|
496 | summary: move files | |||
|
497 | ||||
|
498 | changeset: 3:9e8fbc4bce62 | |||
|
499 | user: test | |||
|
500 | date: Thu Jan 01 00:00:00 1970 +0000 | |||
|
501 | summary: copy files | |||
|
502 | ||||
|
503 | changeset: 2:51a0ae4d5864 | |||
|
504 | user: test | |||
|
505 | date: Thu Jan 01 00:00:00 1970 +0000 | |||
|
506 | summary: remove files | |||
|
507 | ||||
|
508 | changeset: 1:ce8896473775 | |||
|
509 | user: test | |||
|
510 | date: Thu Jan 01 00:00:00 1970 +0000 | |||
|
511 | summary: edit files | |||
|
512 | ||||
|
513 | changeset: 0:30d30fe6a5be | |||
|
514 | user: test | |||
|
515 | date: Thu Jan 01 00:00:00 1970 +0000 | |||
|
516 | summary: add files | |||
|
517 | ||||
|
518 | $ cat normal3 | |||
|
519 | normal3-modified | |||
|
520 | $ cat sub/normal4 | |||
|
521 | normal4-modified | |||
|
522 | $ cat sub/large4 | |||
|
523 | large4-modified | |||
|
524 | $ cat sub2/large6 | |||
|
525 | large6-modified | |||
|
526 | $ cat sub2/large7 | |||
|
527 | large7 | |||
|
528 | ||||
|
529 | Test rollback on largefiles | |||
|
530 | ||||
|
531 | $ echo large4-modified-again > sub/large4 | |||
|
532 | $ hg commit -m "Modify large4 again" | |||
|
533 | $ hg rollback | |||
|
534 | repository tip rolled back to revision 9 (undo commit) | |||
|
535 | working directory now based on revision 9 | |||
|
536 | $ hg st | |||
|
537 | M sub/large4 | |||
|
538 | $ hg log | |||
|
539 | changeset: 9:598410d3eb9a | |||
|
540 | tag: tip | |||
|
541 | user: test | |||
|
542 | date: Thu Jan 01 00:00:00 1970 +0000 | |||
|
543 | summary: modify normal file largefile in repo d | |||
|
544 | ||||
|
545 | changeset: 8:a381d2c8c80e | |||
|
546 | user: test | |||
|
547 | date: Thu Jan 01 00:00:00 1970 +0000 | |||
|
548 | summary: modify normal file and largefile in repo b | |||
|
549 | ||||
|
550 | changeset: 7:daea875e9014 | |||
|
551 | user: test | |||
|
552 | date: Thu Jan 01 00:00:00 1970 +0000 | |||
|
553 | summary: add/edit more largefiles | |||
|
554 | ||||
|
555 | changeset: 6:4355d653f84f | |||
|
556 | user: test | |||
|
557 | date: Thu Jan 01 00:00:00 1970 +0000 | |||
|
558 | summary: edit files yet again | |||
|
559 | ||||
|
560 | changeset: 5:9d5af5072dbd | |||
|
561 | user: test | |||
|
562 | date: Thu Jan 01 00:00:00 1970 +0000 | |||
|
563 | summary: edit files again | |||
|
564 | ||||
|
565 | changeset: 4:74c02385b94c | |||
|
566 | user: test | |||
|
567 | date: Thu Jan 01 00:00:00 1970 +0000 | |||
|
568 | summary: move files | |||
|
569 | ||||
|
570 | changeset: 3:9e8fbc4bce62 | |||
|
571 | user: test | |||
|
572 | date: Thu Jan 01 00:00:00 1970 +0000 | |||
|
573 | summary: copy files | |||
|
574 | ||||
|
575 | changeset: 2:51a0ae4d5864 | |||
|
576 | user: test | |||
|
577 | date: Thu Jan 01 00:00:00 1970 +0000 | |||
|
578 | summary: remove files | |||
|
579 | ||||
|
580 | changeset: 1:ce8896473775 | |||
|
581 | user: test | |||
|
582 | date: Thu Jan 01 00:00:00 1970 +0000 | |||
|
583 | summary: edit files | |||
|
584 | ||||
|
585 | changeset: 0:30d30fe6a5be | |||
|
586 | user: test | |||
|
587 | date: Thu Jan 01 00:00:00 1970 +0000 | |||
|
588 | summary: add files | |||
|
589 | ||||
|
590 | $ cat sub/large4 | |||
|
591 | large4-modified-again | |||
|
592 | ||||
|
593 | Test that `update --clean` leaves correct largefiles in working copy. | |||
|
594 | ||||
|
595 | $ hg update --clean | |||
|
596 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |||
|
597 | getting changed largefiles | |||
|
598 | 1 largefiles updated, 0 removed | |||
|
599 | $ cat normal3 | |||
|
600 | normal3-modified | |||
|
601 | $ cat sub/normal4 | |||
|
602 | normal4-modified | |||
|
603 | $ cat sub/large4 | |||
|
604 | large4-modified | |||
|
605 | $ cat sub2/large6 | |||
|
606 | large6-modified | |||
|
607 | $ cat sub2/large7 | |||
|
608 | large7 | |||
|
609 | ||||
|
610 | Test that verify --large actaully verifies largefiles | |||
|
611 | ||||
|
612 | $ hg verify --large | |||
|
613 | checking changesets | |||
|
614 | checking manifests | |||
|
615 | crosschecking files in changesets and manifests | |||
|
616 | checking files | |||
|
617 | 10 files, 10 changesets, 28 total revisions | |||
|
618 | searching 1 changesets for largefiles | |||
|
619 | verified existence of 3 revisions of 3 largefiles |
General Comments 0
You need to be logged in to leave comments.
Login now