Login
Today In History
Login

This Day In History For 2026-12-05

1 Year Ago (more context)

2025-12-05
16:04
Update OpenSSL usage to avoid deprecated APIs. check-in: 0d239b52b0 user: drh tags: trunk
15:35
Import the recent changes to the sqlite3_qrf_wcwidth() function from SQLite check-in 35f39f7cb1 to cli_wcwidth() for feature parity. check-in: 98287b7b05 user: florian tags: trunk
15:15
Try to align the "fossil tag find" command with the documented behavior (search all tag types) and also don't require foreknowledge of the special prefixes (e.g. "sym-", "wiki-", etc.) while still allowing those to work if known. check-in: fbe5269b7f user: andybradford tags: trunk
14:13
Update the built-in SQLite to the latest trunk version, for testing. check-in: d326547cf3 user: drh tags: trunk

2 Years Ago (more context)

2024-12-05
23:36
Fix a mis-closed blockquote, as reported in forum post 2b17e349f9. check-in: a69823c10b user: stephan tags: trunk
23:15
Fix memory leaks in merge. check-in: 337617ba19 user: drh tags: trunk
20:48
Minor width adjustment for the merge-info GUI on Windows. check-in: bf1af2e546 user: drh tags: trunk
20:12
When doing a merge, if a merge conflict occurs, a new section appears in the merge conflict markings that shows the suggested resolution. In addition, the "merge-info --tk" GUI is improved so that line numbers in the result column correspond with line numbers in the actual file. check-in: 1cf0d372fa user: drh tags: trunk
20:08
Improvements to the file selection option-menu in the merge UI. Closed-Leaf check-in: 4582d69e34 user: drh tags: better-merge
19:22
Improvements to the merge UI. Fix a mostly-harmless assertion associated with merge marks. check-in: 48827897cf user: drh tags: better-merge
18:56
Fix horizontal scrolling in the merge UI. check-in: 06df966b19 user: drh tags: better-merge
18:45
Merge UI menu buttons working on Darwin. check-in: 76b39a2c9f user: drh tags: better-merge
18:00
Improvements to how resizing works in the merge --tk UI. check-in: e9d1d71669 user: drh tags: better-merge
17:13
In the merge engine, make sure V1 is always used for the local copy and V2 is used for the merge-in. check-in: 873b364b92 user: drh tags: better-merge
17:00
Add a new "SUGGESTED CONFLICT RESOLUTION" section to the conflict markings. check-in: adf2269602 user: drh tags: better-merge
13:24
Reduced memory requirements in merge_try_to_resolve_conflict(). check-in: 1651561630 user: drh tags: better-merge
13:16
Bug fixes sufficient to get the automated merge conflict resolution working. check-in: 1174e5f2fd user: drh tags: better-merge
12:15 • Edit [b764f2d007a380d3|b764f2d007]: Mark "Closed". artifact: cfc81d59dd user: drh
12:15
Steps toward doing a better job of automatically resolving merge conflicts. Compiles but does not work. This is an incremental check-in. check-in: 849c7eb6ca user: drh tags: better-merge

3 Years Ago (more context)

2023-12-05
16:02
Provide a dark mode for the TCL/TK-based diff GUI. check-in: b59a42f1f6 user: danield tags: tk-diff-darkmode
14:12
Clean up signal includes. check-in: e6da7f08c8 user: andybradford tags: clone-resume

4 Years Ago (more context)

2022-12-05
03:39
Update the built-in SQLite to the latest 3.41.0 alpha with the query planner tuning enhancements, as a beta-test of SQLite looking for performance regressions. check-in: 4ddd884709 user: drh tags: trunk