Fossil

Differences From Artifact [ad186192f8]:

• File test/merge_renames.test — part of check-in [6a5f0c5b55] at 2016-11-12 22:19:17 on branch trunk — Add test case to handle file add and rename before merging to trunk. Make test_setup return the repository path so it can be used in the test. (user: andybradford size: 12694)

To Artifact [d5c23fbb1e]:

• File test/merge_renames.test — part of check-in [3eeab4a589] at 2016-11-12 22:58:45 on branch trunk — Move the revert in test case to the correct sequence to avoid a merge conflict. (user: andybradford size: 12694)

516
517
518
519
520
521
522
523
524
525
526
527
528

529
530
531
532
533
534
535

516
517
518
519
520
521
522

523
524
525
526
527
528
529
530
531
532
533
534
535

-





+

fossil update b
fossil merge trunk
fossil commit -m "merge trunk" --tag c9
write_file f1 "line1\nline3\nline4"
fossil commit -m "edit f1 on b" --tag c10

fossil revert
fossil update m1
fossil merge b
test_status_list merge_renames-13-7 $RESULT {UPDATE f1}
test_file_contents merge_renames-13-8 f2n "line1"

fossil revert
fossil update trunk
fossil merge --integrate b
test_status_list merge_renames-13-5 $RESULT {UPDATE f1}
test_file_contents merge_renames-13-6 f2n "line1"

######################################
#