Mercurial > hg
comparison tests/test-revert.t @ 22137:2cfe5ec47803
test-revert: add case where file exists neither in "base" nor in "parent"
| author | Pierre-Yves David <pierre-yves.david@fb.com> |
|---|---|
| date | Fri, 27 Jun 2014 18:02:09 +0200 |
| parents | a29574cb8552 |
| children | 80206e63c3cc |
comparison
equal
deleted
inserted
replaced
| 22136:a29574cb8552 | 22137:2cfe5ec47803 |
|---|---|
| 441 > 'modified': ['base', 'parent'], | 441 > 'modified': ['base', 'parent'], |
| 442 > # added: file is missing from base and added in parent | 442 > # added: file is missing from base and added in parent |
| 443 > 'added': [None, 'parent'], | 443 > 'added': [None, 'parent'], |
| 444 > # removed: file exist in base but is removed from parent | 444 > # removed: file exist in base but is removed from parent |
| 445 > 'removed': ['base', None], | 445 > 'removed': ['base', None], |
| 446 > # file exist neither in base not in parent | |
| 447 > 'missing': [None, None], | |
| 446 > } | 448 > } |
| 447 > | 449 > |
| 448 > # content of file in working copy | 450 > # content of file in working copy |
| 449 > wccontent = { | 451 > wccontent = { |
| 450 > # clean: wc content is the same as parent | 452 > # clean: wc content is the same as parent |
| 493 check list of planned files | 495 check list of planned files |
| 494 | 496 |
| 495 $ python gen-revert-cases.py filelist | 497 $ python gen-revert-cases.py filelist |
| 496 added_clean | 498 added_clean |
| 497 clean_clean | 499 clean_clean |
| 500 missing_clean | |
| 498 modified_clean | 501 modified_clean |
| 499 removed_clean | 502 removed_clean |
| 500 | 503 |
| 501 Script to make a simple text version of the content | 504 Script to make a simple text version of the content |
| 502 --------------------------------------------------- | 505 --------------------------------------------------- |
| 648 no changes needed to added_clean | 651 no changes needed to added_clean |
| 649 | 652 |
| 650 ### revert for: clean_clean | 653 ### revert for: clean_clean |
| 651 no changes needed to clean_clean | 654 no changes needed to clean_clean |
| 652 | 655 |
| 656 ### revert for: missing_clean | |
| 657 missing_clean: no such file in rev * (glob) | |
| 658 | |
| 653 ### revert for: modified_clean | 659 ### revert for: modified_clean |
| 654 no changes needed to modified_clean | 660 no changes needed to modified_clean |
| 655 | 661 |
| 656 ### revert for: removed_clean | 662 ### revert for: removed_clean |
| 657 removed_clean: no such file in rev * (glob) | 663 removed_clean: no such file in rev * (glob) |
| 689 > done | 695 > done |
| 690 ### revert for: added_clean | 696 ### revert for: added_clean |
| 691 | 697 |
| 692 ### revert for: clean_clean | 698 ### revert for: clean_clean |
| 693 | 699 |
| 700 ### revert for: missing_clean | |
| 701 missing_clean: no such file in rev * (glob) | |
| 702 | |
| 694 ### revert for: modified_clean | 703 ### revert for: modified_clean |
| 695 | 704 |
| 696 ### revert for: removed_clean | 705 ### revert for: removed_clean |
| 697 | 706 |
| 698 | 707 |