Fossil

Check-in [f0444376]
Login

Check-in [f0444376]

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

Overview
Comment:Fix merge_renames-13-3 on macOs as the expected a filename under /tmp but the result was under the normalized /private/tmp directory.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | test-fixes-2.24
Files: files | file ages | folders
SHA3-256: f04443763459083a672f94524da73f5c34e55437c8be8e77daa364e0538cd81f
User & Date: preben 2023-11-26 17:52:25
Context
2023-11-26
18:18
The amend tests may fail on narrow terminals on systems where the terminal size can be determined when tclsh is running (for me, all but Windows). Closing stdin causes fossil not to wrap output. To avoid fossil complaining about file descriptor zero (which is now used on some systems), temproarily open the script readonly. ... (check-in: 1cb0d57d user: preben tags: test-fixes-2.24)
17:52
Fix merge_renames-13-3 on macOs as the expected a filename under /tmp but the result was under the normalized /private/tmp directory. ... (check-in: f0444376 user: preben tags: test-fixes-2.24)
16:48
Fix json tests that no longer reflects default capabilities for anonymous. ... (check-in: 9ba74ae0 user: preben tags: test-fixes-2.24)
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to test/merge_renames.test.

︙︙
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509

  ADD f2
}
fossil merge trunk
fossil commit -m "merge trunk" --tag c4
fossil mv --hard f2 f2n
test_status_list merge_renames-13-3 $RESULT "
  RENAME f2 f2n
  MOVED_FILE $repoDir/f2
"
fossil commit -m "renamed f2->f2n" --tag c5

fossil update trunk
fossil merge b
test_status_list merge_renames-13-4 $RESULT {ADDED f2n}
fossil commit -m "merge f2n" --tag m1 --tag c6








|








495
496
497
498
499
500
501
502
503
504
505
506
507
508
509

  ADD f2
}
fossil merge trunk
fossil commit -m "merge trunk" --tag c4
fossil mv --hard f2 f2n
test_status_list merge_renames-13-3 $RESULT "
  RENAME f2 f2n
  MOVED_FILE [file normalize $repoDir]/f2
"
fossil commit -m "renamed f2->f2n" --tag c5

fossil update trunk
fossil merge b
test_status_list merge_renames-13-4 $RESULT {ADDED f2n}
fossil commit -m "merge f2n" --tag m1 --tag c6
︙︙