Fossil SCM
Fix merge_renames-13-3 on macOs as the expected a filename under /tmp but the result was under the normalized /private/tmp directory.
Commit
f04443763459083a672f94524da73f5c34e55437c8be8e77daa364e0538cd81f
Parent
9ba74ae04ee2e7a…
1 file changed
+1
-1
+1
-1
| --- test/merge_renames.test | ||
| +++ test/merge_renames.test | ||
| @@ -497,11 +497,11 @@ | ||
| 497 | 497 | fossil merge trunk |
| 498 | 498 | fossil commit -m "merge trunk" --tag c4 |
| 499 | 499 | fossil mv --hard f2 f2n |
| 500 | 500 | test_status_list merge_renames-13-3 $RESULT " |
| 501 | 501 | RENAME f2 f2n |
| 502 | - MOVED_FILE $repoDir/f2 | |
| 502 | + MOVED_FILE [file normalize $repoDir]/f2 | |
| 503 | 503 | " |
| 504 | 504 | fossil commit -m "renamed f2->f2n" --tag c5 |
| 505 | 505 | |
| 506 | 506 | fossil update trunk |
| 507 | 507 | fossil merge b |
| 508 | 508 |
| --- test/merge_renames.test | |
| +++ test/merge_renames.test | |
| @@ -497,11 +497,11 @@ | |
| 497 | fossil merge trunk |
| 498 | fossil commit -m "merge trunk" --tag c4 |
| 499 | fossil mv --hard f2 f2n |
| 500 | test_status_list merge_renames-13-3 $RESULT " |
| 501 | RENAME f2 f2n |
| 502 | MOVED_FILE $repoDir/f2 |
| 503 | " |
| 504 | fossil commit -m "renamed f2->f2n" --tag c5 |
| 505 | |
| 506 | fossil update trunk |
| 507 | fossil merge b |
| 508 |
| --- test/merge_renames.test | |
| +++ test/merge_renames.test | |
| @@ -497,11 +497,11 @@ | |
| 497 | fossil merge trunk |
| 498 | fossil commit -m "merge trunk" --tag c4 |
| 499 | fossil mv --hard f2 f2n |
| 500 | test_status_list merge_renames-13-3 $RESULT " |
| 501 | RENAME f2 f2n |
| 502 | MOVED_FILE [file normalize $repoDir]/f2 |
| 503 | " |
| 504 | fossil commit -m "renamed f2->f2n" --tag c5 |
| 505 | |
| 506 | fossil update trunk |
| 507 | fossil merge b |
| 508 |