Fossil SCM
Fix merge_renames.test: warning about missing common ancestor changed to merge conflict warning; changed markers for RENAMED files. 👀
Commit
34abaf0120a83151fa91960801014ed8fbd84d930320487ba3da6afbe0a4520a
Parent
6c230e885939f21…
1 file changed
+8
-6
+8
-6
| --- test/merge_renames.test | ||
| +++ test/merge_renames.test | ||
| @@ -264,18 +264,20 @@ | ||
| 264 | 264 | |
| 265 | 265 | fossil update trunk |
| 266 | 266 | fossil merge b1 |
| 267 | 267 | fossil merge b2 |
| 268 | 268 | test_status_list merge_renames-8-1 $RESULT { |
| 269 | - WARNING: no common ancestor for f1 | |
| 269 | + MERGE f1 | |
| 270 | + WARNING: 1 merge conflicts | |
| 270 | 271 | } |
| 271 | 272 | |
| 272 | 273 | fossil revert |
| 273 | 274 | fossil merge --integrate b1 |
| 274 | 275 | fossil merge b2 |
| 275 | 276 | test_status_list merge_renames-8-2 $RESULT { |
| 276 | - WARNING: no common ancestor for f1 | |
| 277 | + MERGE f1 | |
| 278 | + WARNING: 1 merge conflicts | |
| 277 | 279 | } |
| 278 | 280 | |
| 279 | 281 | ############################################# |
| 280 | 282 | # Test 9 # |
| 281 | 283 | # Merging a delete/rename/add combination # |
| @@ -308,12 +310,12 @@ | ||
| 308 | 310 | test_status_list merge_renames-9-1 $RESULT $expectedMerge |
| 309 | 311 | fossil changes |
| 310 | 312 | test_status_list merge_renames-9-2 $RESULT " |
| 311 | 313 | MERGED_WITH [commit_id b] |
| 312 | 314 | ADDED_BY_MERGE f1 |
| 313 | - RENAMED f2 | |
| 314 | - DELETED f2 (overwritten by rename) | |
| 315 | + RENAMED f1 -> f2 | |
| 316 | + DELETED f2 -> f2 (overwritten by rename) | |
| 315 | 317 | " |
| 316 | 318 | test_file_contents merge_renames-9-3 f1 "f1.1" |
| 317 | 319 | test_file_contents merge_renames-9-4 f2 "f1" |
| 318 | 320 | |
| 319 | 321 | # Undo and ensure a dry run merge results in no changes |
| @@ -368,12 +370,12 @@ | ||
| 368 | 370 | RENAME f2 -> f1 |
| 369 | 371 | } |
| 370 | 372 | test_file_contents merge_renames-10-5 f1 "f1" |
| 371 | 373 | test_file_contents merge_renames-10-6 f2 "f2" |
| 372 | 374 | test_status_list merge_renames-10-7 [fossil changes] " |
| 373 | - RENAMED f1 | |
| 374 | - RENAMED f2 | |
| 375 | + RENAMED f1 -> f2 | |
| 376 | + RENAMED f2 -> f1 | |
| 375 | 377 | BACKOUT [commit_id trunk] |
| 376 | 378 | " |
| 377 | 379 | fossil commit -m "swap back" ;# V |
| 378 | 380 | |
| 379 | 381 | fossil merge b |
| 380 | 382 |
| --- test/merge_renames.test | |
| +++ test/merge_renames.test | |
| @@ -264,18 +264,20 @@ | |
| 264 | |
| 265 | fossil update trunk |
| 266 | fossil merge b1 |
| 267 | fossil merge b2 |
| 268 | test_status_list merge_renames-8-1 $RESULT { |
| 269 | WARNING: no common ancestor for f1 |
| 270 | } |
| 271 | |
| 272 | fossil revert |
| 273 | fossil merge --integrate b1 |
| 274 | fossil merge b2 |
| 275 | test_status_list merge_renames-8-2 $RESULT { |
| 276 | WARNING: no common ancestor for f1 |
| 277 | } |
| 278 | |
| 279 | ############################################# |
| 280 | # Test 9 # |
| 281 | # Merging a delete/rename/add combination # |
| @@ -308,12 +310,12 @@ | |
| 308 | test_status_list merge_renames-9-1 $RESULT $expectedMerge |
| 309 | fossil changes |
| 310 | test_status_list merge_renames-9-2 $RESULT " |
| 311 | MERGED_WITH [commit_id b] |
| 312 | ADDED_BY_MERGE f1 |
| 313 | RENAMED f2 |
| 314 | DELETED f2 (overwritten by rename) |
| 315 | " |
| 316 | test_file_contents merge_renames-9-3 f1 "f1.1" |
| 317 | test_file_contents merge_renames-9-4 f2 "f1" |
| 318 | |
| 319 | # Undo and ensure a dry run merge results in no changes |
| @@ -368,12 +370,12 @@ | |
| 368 | RENAME f2 -> f1 |
| 369 | } |
| 370 | test_file_contents merge_renames-10-5 f1 "f1" |
| 371 | test_file_contents merge_renames-10-6 f2 "f2" |
| 372 | test_status_list merge_renames-10-7 [fossil changes] " |
| 373 | RENAMED f1 |
| 374 | RENAMED f2 |
| 375 | BACKOUT [commit_id trunk] |
| 376 | " |
| 377 | fossil commit -m "swap back" ;# V |
| 378 | |
| 379 | fossil merge b |
| 380 |
| --- test/merge_renames.test | |
| +++ test/merge_renames.test | |
| @@ -264,18 +264,20 @@ | |
| 264 | |
| 265 | fossil update trunk |
| 266 | fossil merge b1 |
| 267 | fossil merge b2 |
| 268 | test_status_list merge_renames-8-1 $RESULT { |
| 269 | MERGE f1 |
| 270 | WARNING: 1 merge conflicts |
| 271 | } |
| 272 | |
| 273 | fossil revert |
| 274 | fossil merge --integrate b1 |
| 275 | fossil merge b2 |
| 276 | test_status_list merge_renames-8-2 $RESULT { |
| 277 | MERGE f1 |
| 278 | WARNING: 1 merge conflicts |
| 279 | } |
| 280 | |
| 281 | ############################################# |
| 282 | # Test 9 # |
| 283 | # Merging a delete/rename/add combination # |
| @@ -308,12 +310,12 @@ | |
| 310 | test_status_list merge_renames-9-1 $RESULT $expectedMerge |
| 311 | fossil changes |
| 312 | test_status_list merge_renames-9-2 $RESULT " |
| 313 | MERGED_WITH [commit_id b] |
| 314 | ADDED_BY_MERGE f1 |
| 315 | RENAMED f1 -> f2 |
| 316 | DELETED f2 -> f2 (overwritten by rename) |
| 317 | " |
| 318 | test_file_contents merge_renames-9-3 f1 "f1.1" |
| 319 | test_file_contents merge_renames-9-4 f2 "f1" |
| 320 | |
| 321 | # Undo and ensure a dry run merge results in no changes |
| @@ -368,12 +370,12 @@ | |
| 370 | RENAME f2 -> f1 |
| 371 | } |
| 372 | test_file_contents merge_renames-10-5 f1 "f1" |
| 373 | test_file_contents merge_renames-10-6 f2 "f2" |
| 374 | test_status_list merge_renames-10-7 [fossil changes] " |
| 375 | RENAMED f1 -> f2 |
| 376 | RENAMED f2 -> f1 |
| 377 | BACKOUT [commit_id trunk] |
| 378 | " |
| 379 | fossil commit -m "swap back" ;# V |
| 380 | |
| 381 | fossil merge b |
| 382 |