Fossil

Check-in [3eeab4a5]
Login

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Move the revert in test case to the correct sequence to avoid a merge conflict.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1:3eeab4a58954f28374503af81a8cff43ff468d20
User & Date: andybradford 2016-11-12 22:58:45
Context
2016-11-15
00:30
Fix timeline -n 0 to display an unlimited number of lines (rather than zero) to match documentation. Correct timeline -n for negative N documentation to match actual behavior. Limit compute_ancestors() and compute_descendants() on the assumption that there is no more than one entry per line. check-in: def9af43 user: andygoth tags: trunk
2016-11-12
22:58
Move the revert in test case to the correct sequence to avoid a merge conflict. check-in: 3eeab4a5 user: andybradford tags: trunk
22:19
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. check-in: 6a5f0c5b user: andybradford tags: trunk
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to test/merge_renames.test.

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 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"

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







<





>







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 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"

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