Fossil SCM
Fix test 13 in merge_renames.test.
Commit
ad918d6612e88d375061baa1b57a80ab5ef11c424e01032467fdc9b61ea35904
Parent
33e518b1e2e534e…
1 file changed
-6
| --- test/merge_renames.test | ||
| +++ test/merge_renames.test | ||
| @@ -523,33 +523,27 @@ | ||
| 523 | 523 | |
| 524 | 524 | fossil update m1 |
| 525 | 525 | fossil merge b |
| 526 | 526 | test_status_list merge_renames-13-6 $RESULT { |
| 527 | 527 | UPDATE f1 |
| 528 | - DELETE f2n | |
| 529 | - ADDED f2n | |
| 530 | 528 | } |
| 531 | 529 | test_file_contents merge_renames-13-7 f2n "line1" |
| 532 | 530 | |
| 533 | 531 | fossil revert |
| 534 | 532 | test_status_list merge_renames-13-8 $RESULT { |
| 535 | 533 | REVERT f1 |
| 536 | - REVERT f2n | |
| 537 | 534 | } |
| 538 | 535 | fossil update trunk |
| 539 | 536 | fossil merge --integrate b |
| 540 | 537 | test_status_list merge_renames-13-9 $RESULT { |
| 541 | 538 | UPDATE f1 |
| 542 | - DELETE f2n | |
| 543 | - ADDED f2n | |
| 544 | 539 | } |
| 545 | 540 | test_file_contents merge_renames-13-10 f2n "line1" |
| 546 | 541 | |
| 547 | 542 | fossil revert |
| 548 | 543 | test_status_list merge_renames-13-11 $RESULT { |
| 549 | 544 | REVERT f1 |
| 550 | - REVERT f2n | |
| 551 | 545 | } |
| 552 | 546 | |
| 553 | 547 | ###################################### |
| 554 | 548 | # |
| 555 | 549 | # Tests for troubles not specifically linked with renames but that I'd like to |
| 556 | 550 |
| --- test/merge_renames.test | |
| +++ test/merge_renames.test | |
| @@ -523,33 +523,27 @@ | |
| 523 | |
| 524 | fossil update m1 |
| 525 | fossil merge b |
| 526 | test_status_list merge_renames-13-6 $RESULT { |
| 527 | UPDATE f1 |
| 528 | DELETE f2n |
| 529 | ADDED f2n |
| 530 | } |
| 531 | test_file_contents merge_renames-13-7 f2n "line1" |
| 532 | |
| 533 | fossil revert |
| 534 | test_status_list merge_renames-13-8 $RESULT { |
| 535 | REVERT f1 |
| 536 | REVERT f2n |
| 537 | } |
| 538 | fossil update trunk |
| 539 | fossil merge --integrate b |
| 540 | test_status_list merge_renames-13-9 $RESULT { |
| 541 | UPDATE f1 |
| 542 | DELETE f2n |
| 543 | ADDED f2n |
| 544 | } |
| 545 | test_file_contents merge_renames-13-10 f2n "line1" |
| 546 | |
| 547 | fossil revert |
| 548 | test_status_list merge_renames-13-11 $RESULT { |
| 549 | REVERT f1 |
| 550 | REVERT f2n |
| 551 | } |
| 552 | |
| 553 | ###################################### |
| 554 | # |
| 555 | # Tests for troubles not specifically linked with renames but that I'd like to |
| 556 |
| --- test/merge_renames.test | |
| +++ test/merge_renames.test | |
| @@ -523,33 +523,27 @@ | |
| 523 | |
| 524 | fossil update m1 |
| 525 | fossil merge b |
| 526 | test_status_list merge_renames-13-6 $RESULT { |
| 527 | UPDATE f1 |
| 528 | } |
| 529 | test_file_contents merge_renames-13-7 f2n "line1" |
| 530 | |
| 531 | fossil revert |
| 532 | test_status_list merge_renames-13-8 $RESULT { |
| 533 | REVERT f1 |
| 534 | } |
| 535 | fossil update trunk |
| 536 | fossil merge --integrate b |
| 537 | test_status_list merge_renames-13-9 $RESULT { |
| 538 | UPDATE f1 |
| 539 | } |
| 540 | test_file_contents merge_renames-13-10 f2n "line1" |
| 541 | |
| 542 | fossil revert |
| 543 | test_status_list merge_renames-13-11 $RESULT { |
| 544 | REVERT f1 |
| 545 | } |
| 546 | |
| 547 | ###################################### |
| 548 | # |
| 549 | # Tests for troubles not specifically linked with renames but that I'd like to |
| 550 |