Fossil SCM
Update test case now that merge rename bug has been fixed with checkin [0df5249d51].
Commit
b09be7ba2f774a9fc66397e5e36775d9c6e1e1f7
Parent
88d581dc5e1d946…
1 file changed
+23
-4
+23
-4
| --- test/merge_renames.test | ||
| +++ test/merge_renames.test | ||
| @@ -514,24 +514,43 @@ | ||
| 514 | 514 | write_file f1 "line1\nline3\nline2\nline4" |
| 515 | 515 | fossil commit -m "edit f1 on trunk" --tag c8 |
| 516 | 516 | |
| 517 | 517 | fossil update b |
| 518 | 518 | fossil merge trunk |
| 519 | +test_status_list merge_renames-13-5 $RESULT {MERGE f1} | |
| 519 | 520 | fossil commit -m "merge trunk" --tag c9 |
| 520 | 521 | write_file f1 "line1\nline3\nline4" |
| 521 | 522 | fossil commit -m "edit f1 on b" --tag c10 |
| 522 | 523 | |
| 523 | 524 | fossil update m1 |
| 524 | 525 | fossil merge b |
| 525 | -test_status_list merge_renames-13-7 $RESULT {UPDATE f1} | |
| 526 | -test_file_contents merge_renames-13-8 f2n "line1" | |
| 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" | |
| 527 | 532 | |
| 528 | 533 | fossil revert |
| 534 | +test_status_list merge_renames-13-8 $RESULT { | |
| 535 | + REVERT f1 | |
| 536 | + REVERT f2n | |
| 537 | +} | |
| 529 | 538 | fossil update trunk |
| 530 | 539 | fossil merge --integrate b |
| 531 | -test_status_list merge_renames-13-5 $RESULT {UPDATE f1} | |
| 532 | -test_file_contents merge_renames-13-6 f2n "line1" | |
| 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 | +} | |
| 533 | 552 | |
| 534 | 553 | ###################################### |
| 535 | 554 | # |
| 536 | 555 | # Tests for troubles not specifically linked with renames but that I'd like to |
| 537 | 556 | # write: |
| 538 | 557 |
| --- test/merge_renames.test | |
| +++ test/merge_renames.test | |
| @@ -514,24 +514,43 @@ | |
| 514 | write_file f1 "line1\nline3\nline2\nline4" |
| 515 | fossil commit -m "edit f1 on trunk" --tag c8 |
| 516 | |
| 517 | fossil update b |
| 518 | fossil merge trunk |
| 519 | fossil commit -m "merge trunk" --tag c9 |
| 520 | write_file f1 "line1\nline3\nline4" |
| 521 | fossil commit -m "edit f1 on b" --tag c10 |
| 522 | |
| 523 | fossil update m1 |
| 524 | fossil merge b |
| 525 | test_status_list merge_renames-13-7 $RESULT {UPDATE f1} |
| 526 | test_file_contents merge_renames-13-8 f2n "line1" |
| 527 | |
| 528 | fossil revert |
| 529 | fossil update trunk |
| 530 | fossil merge --integrate b |
| 531 | test_status_list merge_renames-13-5 $RESULT {UPDATE f1} |
| 532 | test_file_contents merge_renames-13-6 f2n "line1" |
| 533 | |
| 534 | ###################################### |
| 535 | # |
| 536 | # Tests for troubles not specifically linked with renames but that I'd like to |
| 537 | # write: |
| 538 |
| --- test/merge_renames.test | |
| +++ test/merge_renames.test | |
| @@ -514,24 +514,43 @@ | |
| 514 | write_file f1 "line1\nline3\nline2\nline4" |
| 515 | fossil commit -m "edit f1 on trunk" --tag c8 |
| 516 | |
| 517 | fossil update b |
| 518 | fossil merge trunk |
| 519 | test_status_list merge_renames-13-5 $RESULT {MERGE f1} |
| 520 | fossil commit -m "merge trunk" --tag c9 |
| 521 | write_file f1 "line1\nline3\nline4" |
| 522 | fossil commit -m "edit f1 on b" --tag c10 |
| 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 | # write: |
| 557 |