Fossil

Timeline
Login

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

67 descendants of release

2024-12-04
19:25
Fix rendering of merge information that contains "N" entries followed by "S". ... (Leaf check-in: 2ec8a7ae user: drh tags: trunk)
18:57
Bug fix in the previous check-in for the "--tk" option on the "3-way-merge" command. ... (check-in: d6fa91fd user: drh tags: trunk)
18:49
Improved controls at the top of the --tk merge information GUI. ... (check-in: f8932be5 user: drh tags: trunk)
17:00
Wrap the list of attachments displayed on technotes/events, tickets and wiki pages in their own 'section' HTML element with CSS class name 'attachlist'. Inspired by forum thread 8da5a5d868. ... (check-in: 4f9ecd03 user: stephan tags: trunk)
15:59
Fix a mis-quoted DOM element attribute, as reported in forum post 5bdbb8b949. ... (check-in: f96a3ba7 user: stephan tags: trunk)
13:42
Fix uninitialized variable in the "fossil merge-info --tk" command. ... (check-in: 3165e1bf user: drh tags: trunk)
13:40
Add the "fossil merge-info" command for improved situational awareness on complex merge operations. ... (check-in: aa829657 user: drh tags: trunk)
13:38
By default, the merge-info command only shows "interesting" change - actual merges, errors, and conflicts. Use the --all option to see everything. ... (Leaf check-in: b764f2d0 user: drh tags: merge-enhancements)
12:05
Issue warnings if a user tries to commit a check-in where the branch has changed. See the discussion at forum thread 7f5ae505e4144a0c. ... (check-in: 24537178 user: drh tags: trunk)
11:58
Minor tweaks to the wording of the warning message that is show when commited to a moved branch. ... (Closed-Leaf check-in: 8cfa177f user: drh tags: show-branch-change)
06:32
Correct a mismatched TD HTML tag, as reported in forum post 5a7ca99ebe. ... (check-in: 11dafcf6 user: stephan tags: trunk)
2024-12-03
20:37
The "fossil merge-info --tk" command appears to be working. Probably there are still undiscovered bugs. ... (check-in: a199d970 user: drh tags: merge-enhancements)
19:20
The "fossil merge-info --tcl FILE" command generates content for the merge.tcl GUI using MERGESTAT data. Incremental check-in. ... (check-in: cbd24a25 user: drh tags: merge-enhancements)
18:13
Record information about merge operations in the localdb.mergestat table. Make that information available using the merge-info command. ... (check-in: 625ff9d5 user: drh tags: merge-enhancements)
13:36
Add filename labels at the top of each column in the merge display. ... (check-in: 7b8be852 user: drh tags: merge-enhancements)
12:36
Improvements to "3-way --tk" ... (check-in: 4a70c64a user: drh tags: merge-enhancements)
01:31
Add the "-c N" option to "fossil 3-way --tk". ... (check-in: c4b68636 user: drh tags: merge-enhancements)
01:06
Improvements to the new merge display. ... (check-in: 7002d98d user: drh tags: merge-enhancements)
2024-12-02
21:36
Continuing work on the --tk option to the 3-way-merge command. ... (check-in: 57ae422a user: drh tags: merge-enhancements)
2024-12-01
05:23
This should just be for propagating tags, not single. ... (check-in: c34cf835 user: andybradford tags: show-branch-change)
01:44
Check the tagxref table for changes to branch name before commit and if there exists a change that wasn't made by the current user then prompt. ... (check-in: 0aabb6bc user: andybradford tags: show-branch-change)
2024-11-30
17:37
When --no-prompt is being used and there is a branch name change during commit skip the prompt and the condition because it's not a fatal condition. ... (check-in: c552f440 user: andybradford tags: show-branch-change)
2024-11-29
16:23
When --force is specified do not treat a branch name change that arrives during autosync as fatal. ... (check-in: 82fee40e user: andybradford tags: show-branch-change)
2024-11-28
21:54
Preliminary implementation of a --tk option to the 3-way-merge command. Lots of work left to do to get this working well. ... (check-in: bdcacd55 user: drh tags: merge-enhancements)
19:13
Add a --tcl option to the 3-way-merge command. ... (check-in: 97ab5604 user: drh tags: merge-enhancements)
15:07
Refactor the 3-way-merge logic to make it easier to extend and enhance. ... (check-in: c4df699f user: drh tags: merge-enhancements)
2024-11-27
20:29
I think this conveys the message with slightly more clarity. ... (check-in: 4e7e1647 user: andybradford tags: show-branch-change)
19:28
If the branch name changes during a commit, prompt user to confirm continue (behaves similar to other pre-commit checks). Inspired by forum post d5a1b209186552dd. ... (check-in: a70f279a user: andybradford tags: show-branch-change)
17:07
Wrap the list of attachments displayed on technotes/events, tickets and wiki pages in their own `section' HTML element with CSS class name 'attachlist'. Inspired by forum thread 8da5a5d868. ... (Closed-Leaf check-in: b111adbe user: florian tags: attachlist-html-section)
2024-11-26
19:49
Minor update to conform to style, no change in function. ... (check-in: 8e06863e user: andybradford tags: show-branch-change)
19:24
Only emit the change in branch if there is no VERSION argument to minimize additional output. ... (check-in: 2ef47b81 user: andybradford tags: show-branch-change)
05:20
Implement the equivalent to the `inode' SQL function on Windows. ... (check-in: 52333641 user: florian tags: trunk)
05:17
Fix a crash if the test-file-environment command is called from outside a check-out (introduced with [106de276ee]). ... (check-in: 38930fba user: florian tags: trunk)
2024-11-24
03:38
Improve situational awareness with "fossil update" by including a message in the changes: information if the name of the branch changes. See forum discussion 7f5ae505e4144a0c for details. ... (check-in: bb9150c4 user: andybradford tags: show-branch-change)
2024-11-23
21:27
Improvements to the logic in the "fossil all" command that removes redundant entries for repositories in the global_config table. If two or more entries share the same inode, only use the first one. On Windows (which lacks inodes) determine uniqueness by the full, canonical pathname. ... (check-in: 106de276 user: drh tags: trunk)
17:22
Bug fix for allowing SSH command to be overridden once for sync operations. ... (check-in: 4c6e394d user: andybradford tags: trunk)
17:19
Prepare for merge into trunk. ... (Closed-Leaf check-in: c88ed3e1 user: andybradford tags: ssh-command-once)
01:11
This fixes the logic error introduced in [f019cb5fc3f]. ... (check-in: 25857ebb user: andybradford tags: ssh-command-once)
01:08
This commit had more than I had intended. ... (check-in: 91adccdb user: andybradford tags: ssh-command-once)
01:07
Fix logic error from previous commit. ... (check-in: 3ada7a67 user: andybradford tags: ssh-command-once)
2024-11-22
15:11
When using --once with --ssh-command, prefer the command-line argument over the stored option. Addresses forum post 90c1f5fef258c704. ... (check-in: f019cb5f user: andybradford tags: ssh-command-once)
14:29
Provide the ability to make exceptions to maximum number of query parameters on the robot restrictor. ... (check-in: 87368b3e user: drh tags: trunk)
2024-11-21
13:34
Strengthen the file_is_canonical() routine so that it returns false on Windows if the pathname does not begin with a drive letter. ... (check-in: f6ff25e1 user: drh tags: trunk)
13:06
Enhance the file_canonical_name() function so that it always includes the drive letter prefix on Windows. ... (check-in: 40376ef8 user: drh tags: trunk)
2024-11-19
14:28
Fix the /timeline page such that when the rl= query parameter is used, subsequent hyperlinks are correct. ... (check-in: 761c24e7 user: drh tags: trunk)
13:08
Simplifications to the Forum setup page. ... (check-in: 25e4b542 user: drh tags: trunk)
12:52
New setting "forum-title" is the title of the Forum. ... (check-in: f646537c user: drh tags: trunk)
2024-11-18
17:50
Fix the checksum function in the delta logic. ... (check-in: 4862fc5e user: drh tags: trunk)
17:40
Fix the checksum routine in the delta logic so that it works correctly even if the input size is zero. ... (Closed-Leaf check-in: ec5e2919 user: drh tags: delta-fix)
2024-11-15
14:14
Add the ability to show the difference between two SQLite database files. ... (Closed-Leaf check-in: 27c81f1c user: drh tags: sqldiff)
13:51
Update the built-in SQLite to the latest 3.48.0 alpha - mostly to get rid of the #line macros in sqlite3.c that were somehow introduced in the previous update. ... (check-in: 5493cc7b user: drh tags: trunk)
2024-11-13
11:23
Change the /setup_ulist page to show the most recently changed users first by default, as that seems to be the most common use case. ... (check-in: 7b0a2378 user: drh tags: trunk)
11:08
Merge typo fixes and improvements to built-in documentation from the bv-corrections01 branch. ... (check-in: 75c45fd8 user: drh tags: trunk)
07:20
Amend the previous commit not to break (test) builds with SSL/TLS disabled. ... (check-in: aa0b696e user: florian tags: trunk)
2024-11-12
09:27
Added extra switch parsing. I still need to figure out how to get switches emitted without using '' around. ... (Leaf check-in: f127fc53 user: brickviking tags: bv-infotool)
2024-11-11
12:27
(Typos) src/db.c changes. ... (Leaf check-in: 46ec93b6 user: brickviking tags: bv-corrections01)
12:10
src/diffcmd.c change. ... (check-in: 59d97d28 user: brickviking tags: bv-corrections01)
11:55
src/chat.c change. ... (check-in: 40d3132f user: brickviking tags: bv-corrections01)
11:49
src/checkin.c changes ... (check-in: efdd823f user: brickviking tags: bv-corrections01)
2024-11-07
06:50
Merge trunk into ui-local-diff branch, resolving one merge conflict in info.c:hexdump_page(). ... (Leaf check-in: d57463cc user: stephan tags: ui-local-diff)
05:41
Added tool to create preliminary info-formatted file. It needs bash, tail and GNU sed, as well as makeinfo. ... (check-in: 302bf06d user: brickviking tags: bv-infotool)
05:39
Merge from trunk ... (check-in: 26ea82a7 user: brickviking tags: bv-infotool)
01:09
Added clarification note for merge command. ... (check-in: a35cfda9 user: brickviking tags: bv-corrections01)
2024-11-06
13:29
Merge all the latest trunk enhancements and fixes into the bv-corrections01 branch. ... (check-in: c1aefb00 user: drh tags: bv-corrections01)
13:22
Add the --no-cert-verify option to the test-httpmsg command. ... (check-in: 3380c7fe user: drh tags: trunk)
13:21
Increase the version number to 2.26 in order to start the next release cycle. Update the built-in SQLite to the latest 3.48.0 pre-release for testing. Add the 2_26 tag to the change log. ... (check-in: 66899f89 user: drh tags: trunk)
12:59
Version 2.25 ... (check-in: 8f798279 user: drh tags: trunk, release, version-2.25)