Show More
@@ -441,6 +441,8 b' Write the python script to disk' | |||
|
441 | 441 | > 'modified': ['base', 'parent'], |
|
442 | 442 | > # added: file is missing from base and added in parent |
|
443 | 443 | > 'added': [None, 'parent'], |
|
444 | > # removed: file exist in base but is removed from parent | |
|
445 | > 'removed': ['base', None], | |
|
444 | 446 | > } |
|
445 | 447 | > |
|
446 | 448 | > # content of file in working copy |
@@ -494,6 +496,7 b' check list of planned files' | |||
|
494 | 496 | added_clean |
|
495 | 497 | clean_clean |
|
496 | 498 | modified_clean |
|
499 | removed_clean | |
|
497 | 500 | |
|
498 | 501 | Script to make a simple text version of the content |
|
499 | 502 | --------------------------------------------------- |
@@ -522,9 +525,11 b' Generate base changeset' | |||
|
522 | 525 | $ hg addremove --similarity 0 |
|
523 | 526 | adding clean_clean |
|
524 | 527 | adding modified_clean |
|
528 | adding removed_clean | |
|
525 | 529 | $ hg status |
|
526 | 530 | A clean_clean |
|
527 | 531 | A modified_clean |
|
532 | A removed_clean | |
|
528 | 533 | $ hg commit -m 'base' |
|
529 | 534 | |
|
530 | 535 | (create a simple text version of the content) |
@@ -533,15 +538,18 b' Generate base changeset' | |||
|
533 | 538 | $ cat ../content-base.txt |
|
534 | 539 | base clean_clean |
|
535 | 540 | base modified_clean |
|
541 | base removed_clean | |
|
536 | 542 | |
|
537 | 543 | Create parent changeset |
|
538 | 544 | |
|
539 | 545 | $ python ../gen-revert-cases.py parent |
|
540 | 546 | $ hg addremove --similarity 0 |
|
541 | 547 | adding added_clean |
|
548 | removing removed_clean | |
|
542 | 549 | $ hg status |
|
543 | 550 | M modified_clean |
|
544 | 551 | A added_clean |
|
552 | R removed_clean | |
|
545 | 553 | $ hg commit -m 'parent' |
|
546 | 554 | |
|
547 | 555 | (create a simple text version of the content) |
@@ -561,6 +569,7 b' Setup working directory' | |||
|
561 | 569 | $ hg status --rev 'desc("base")' |
|
562 | 570 | M modified_clean |
|
563 | 571 | A added_clean |
|
572 | R removed_clean | |
|
564 | 573 | |
|
565 | 574 | (create a simple text version of the content) |
|
566 | 575 | |
@@ -607,6 +616,7 b' check revert output' | |||
|
607 | 616 | $ hg revert --all --rev 'desc(base)' |
|
608 | 617 | removing added_clean |
|
609 | 618 | reverting modified_clean |
|
619 | adding removed_clean | |
|
610 | 620 | |
|
611 | 621 | Compare resulting directory with revert target. |
|
612 | 622 | |
@@ -643,6 +653,9 b' revert all files individually and check ' | |||
|
643 | 653 | ### revert for: modified_clean |
|
644 | 654 | no changes needed to modified_clean |
|
645 | 655 | |
|
656 | ### revert for: removed_clean | |
|
657 | removed_clean: no such file in rev * (glob) | |
|
658 | ||
|
646 | 659 | |
|
647 | 660 | check resulting directory againt the --all run |
|
648 | 661 | (There should be no difference) |
@@ -680,6 +693,8 b' Misbehavior:' | |||
|
680 | 693 | |
|
681 | 694 | ### revert for: modified_clean |
|
682 | 695 | |
|
696 | ### revert for: removed_clean | |
|
697 | ||
|
683 | 698 | |
|
684 | 699 | check resulting directory againt the --all run |
|
685 | 700 | (There should be no difference) |
General Comments 0
You need to be logged in to leave comments.
Login now