Fossil

Check-in [b09be7ba]
Login

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

Overview
Comment:Update test case now that merge rename bug has been fixed with checkin [0df5249d51].
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: b09be7ba2f774a9fc66397e5e36775d9c6e1e1f7
User & Date: andybradford 2016-12-28 18:20:02
Context
2016-12-30
00:15
Update the built-in SQLite to the 3.16.0 beta for testing. check-in: 53430370 user: drh tags: trunk
2016-12-28
18:20
Update test case now that merge rename bug has been fixed with checkin [0df5249d51]. check-in: b09be7ba user: andybradford tags: trunk
2016-12-26
14:00
Update the built-in SQLite to fix a potential (unreleased) corruption bug. check-in: 88d581dc user: drh tags: trunk
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to test/merge_renames.test.

512
513
514
515
516
517
518

519
520
521
522
523
524
525




526
527
528




529
530
531




532






533
534
535
536
537
538
539
540
541
542
543
544

fossil update trunk
write_file f1 "line1\nline3\nline2\nline4"
fossil commit -m "edit f1 on trunk" --tag c8

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"







######################################
#
# Tests for troubles not specifically linked with renames but that I'd like to
# write:
#  [c26c63eb1b] - 'merge --backout' does not handle conflicts properly
#  [953031915f] - Lack of warning when overwriting extra files
#  [4df5f38f1e] - Troubles merging a file delete with a file change

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

test_cleanup







>






|
>
>
>
>
|


>
>
>
>


|
>
>
>
>
|
>
>
>
>
>
>












512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563

fossil update trunk
write_file f1 "line1\nline3\nline2\nline4"
fossil commit -m "edit f1 on trunk" --tag c8

fossil update b
fossil merge trunk
test_status_list merge_renames-13-5 $RESULT {MERGE f1}
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-6 $RESULT {
  UPDATE f1
  DELETE f2n
  ADDED f2n
}
test_file_contents merge_renames-13-7 f2n "line1"

fossil revert
test_status_list merge_renames-13-8 $RESULT {
  REVERT f1
  REVERT f2n
}
fossil update trunk
fossil merge --integrate b
test_status_list merge_renames-13-9 $RESULT {
  UPDATE f1
  DELETE f2n
  ADDED f2n
}
test_file_contents merge_renames-13-10 f2n "line1"

fossil revert
test_status_list merge_renames-13-11 $RESULT {
  REVERT f1
  REVERT f2n
}

######################################
#
# Tests for troubles not specifically linked with renames but that I'd like to
# write:
#  [c26c63eb1b] - 'merge --backout' does not handle conflicts properly
#  [953031915f] - Lack of warning when overwriting extra files
#  [4df5f38f1e] - Troubles merging a file delete with a file change

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

test_cleanup