Fossil SCM
Move the revert in test case to the correct sequence to avoid a merge conflict.
Commit
3eeab4a58954f28374503af81a8cff43ff468d20
Parent
6a5f0c5b557a70a…
1 file changed
+1
-1
+1
-1
| --- test/merge_renames.test | ||
| +++ test/merge_renames.test | ||
| @@ -518,16 +518,16 @@ | ||
| 518 | 518 | fossil merge trunk |
| 519 | 519 | fossil commit -m "merge trunk" --tag c9 |
| 520 | 520 | write_file f1 "line1\nline3\nline4" |
| 521 | 521 | fossil commit -m "edit f1 on b" --tag c10 |
| 522 | 522 | |
| 523 | -fossil revert | |
| 524 | 523 | fossil update m1 |
| 525 | 524 | fossil merge b |
| 526 | 525 | test_status_list merge_renames-13-7 $RESULT {UPDATE f1} |
| 527 | 526 | test_file_contents merge_renames-13-8 f2n "line1" |
| 528 | 527 | |
| 528 | +fossil revert | |
| 529 | 529 | fossil update trunk |
| 530 | 530 | fossil merge --integrate b |
| 531 | 531 | test_status_list merge_renames-13-5 $RESULT {UPDATE f1} |
| 532 | 532 | test_file_contents merge_renames-13-6 f2n "line1" |
| 533 | 533 | |
| 534 | 534 |
| --- test/merge_renames.test | |
| +++ test/merge_renames.test | |
| @@ -518,16 +518,16 @@ | |
| 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 revert |
| 524 | fossil update m1 |
| 525 | fossil merge b |
| 526 | test_status_list merge_renames-13-7 $RESULT {UPDATE f1} |
| 527 | test_file_contents merge_renames-13-8 f2n "line1" |
| 528 | |
| 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 |
| --- test/merge_renames.test | |
| +++ test/merge_renames.test | |
| @@ -518,16 +518,16 @@ | |
| 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 |