Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
50 most recent check-ins
|
2024-12-10
| ||
| 13:13 | Add an "unprotect()" call to /ckout so that it can see that files have changed and update the vfile table appropriately. Updates to diff command-line parser comments to mention all the latest options. ... (Leaf check-in: a2a0390c user: drh tags: trunk) | |
| 12:53 | Add the /ckout page. ... (check-in: d35d2018 user: drh tags: trunk) | |
| 12:52 | Update the help message for the /ckout page. ... (Closed-Leaf check-in: 5ba44a13 user: drh tags: ckout-page) | |
| 12:38 | Be sure to call vfile_check_signature() so that edits are detected prior to generating diffs on the /ckout page. ... (check-in: 6affaac9 user: drh tags: ckout-page) | |
| 12:16 | Add diffs to the /ckout page. ... (check-in: 2578684c user: drh tags: ckout-page) | |
| 06:25 | Merge trunk into merge-info-html branch for mergestat improvements. ... (Leaf check-in: f0a48c8f user: stephan tags: merge-info-html) | |
| 00:36 | Begin adding the infrastructure for a /ckout webpage. ... (check-in: c620a8c7 user: drh tags: ckout-page) | |
| 00:09 | Fix an obscure possible bug in "fossil ui DIR" if there are 96 or more additional arguments. ... (check-in: de6f88a6 user: drh tags: trunk) | |
|
2024-12-09
| ||
| 23:03 | Update the built-in SQLite to the latests trunk version, which includes fixes found in 3.47.2, plus other enhancements. ... (check-in: 077e53a3 user: drh tags: trunk) | |
| 22:51 | Fix a bug in text-merge for the case when the same change occurs along both branches. ... (check-in: 58c74fc5 user: drh tags: trunk) | |
| 22:45 | Gather more transformations for merge-info in a "fossil update". ... (check-in: 565a4906 user: drh tags: trunk) | |
| 17:38 | Record merge-info information for the "fossil update" command. ... (check-in: 3a18c95d user: drh tags: trunk) | |
| 16:47 | The output from "fossil merge-info" appears in priority order: CONFLICT first, then MERGE, then other minor changes. ... (check-in: 0b5dfa9f user: drh tags: trunk) | |
| 08:17 | Move filename info into the corresponding merge-info table. Start adding infrastructure for emitting HTML-mode output to the content columns. ... (check-in: e3a3f0a5 user: stephan tags: merge-info-html) | |
| 07:10 | Change width:1px sizes to width:fit-content on diff line-number and change-type cols for diff --browser and friends. ... (check-in: 8c6dddc6 user: stephan tags: trunk) | |
| 07:08 | Get stub table layout in place for merge-info --html. It's not yet clear whether this will suffice. ... (check-in: 5a1da556 user: stephan tags: merge-info-html) | |
| 07:05 | Fix width:1px sizes on diff line-number and change-type cols for diff --browser and friends. ... (check-in: d2d01d3e user: stephan tags: merge-info-html) | |
|
2024-12-07
| ||
| 20:14 | Plug the debug merge builder into the html builder's as-yet-unimplemented methods to assist in thinking through the next steps. ... (check-in: d18f24e2 user: stephan tags: merge-info-html) | |
| 19:52 | Set up the main file list loop for merge_info_html(). ... (check-in: 81457255 user: stephan tags: merge-info-html) | |
| 18:21 | Use a temp table to consolidate how merge-info --html collects its list of files to process. ... (check-in: 04a868ac user: stephan tags: merge-info-html) | |
| 07:29 | Updated comments, improved output further. More to come. ... (Leaf check-in: 6ee05bf6 user: brickviking tags: bv-infotool) | |
| 05:19 | Add skeleton for the MergeBuilderHtml, but it doesn't do anything right now except for fail to outright crash. Add an empty TITLE tag to the diff web page output so that a title can be more easily set via JS. ... (check-in: e76aceba user: stephan tags: merge-info-html) | |
| 03:31 | Add scaffolding for iterating over lists of files for merge-info --html. Simply emit a UL list for the time being. ... (check-in: 8bb036bf user: stephan tags: merge-info-html) | |
| 02:26 | Attempt to get the CSS grid view in place for merge-info --html. It can't be tested until we fill out with content, though. ... (check-in: 5eac2b1b user: stephan tags: merge-info-html) | |
|
2024-12-06
| ||
| 23:46 | Initial empty scaffolding for merge-info --html/--browser options. There is still much to do here. ... (check-in: ca7eceb9 user: stephan tags: merge-info-html) | |
| 19:07 | An improved method for clearing out unwanted table during rebuild. ... (check-in: aeec557e user: drh tags: trunk) | |
| 13:49 | Fix the rebuilder so that it does not try to drop shadow tables, which cannot be dropped in newer versions of SQLite, and thus does not error out for databases that have FTS indexes. ... (check-in: 55f13661 user: drh tags: trunk) | |
| 13:37 | Make more use of WITHOUT ROWID tables in the main schema. ... (check-in: b8011bf5 user: drh tags: trunk) | |
| 10:59 | Automatically shrink the width of the merge-info --tk GUI so that it fits into the available console space. ... (check-in: e7575343 user: drh tags: trunk) | |
| 09:33 | Improvements to pdf-formatted info documentation. ... (check-in: e1b14acf user: brickviking tags: bv-infotool) | |
| 08:31 | Updated version, terminated header sentences. ... (check-in: 03d36f0f user: brickviking tags: bv-infotool) | |
| 06:16 | Put back forgotten @bye, needed for makeinfo --pdf output. ... (check-in: 28656971 user: brickviking tags: bv-infotool) | |
| 06:13 | Merge latest from trunk ... (check-in: f040c11f user: brickviking tags: bv-infotool) | |
| 05:17 | Whitespace removal ... (check-in: bbf6c307 user: brickviking tags: trunk) | |
| 05:07 | (Grammar) Remove duplicate word in comment. ... (check-in: 6ebc9e0e user: brickviking tags: trunk) | |
| 04:07 | Fix a very minor memory leak in the merge logic. ... (check-in: 6ff817d3 user: drh tags: trunk) | |
| 04:03 | Fix a "%d" that ought to be a "%lld" because the argument is a 64-bit integer. This error causes no problems on 64-bit builds, but fails horribly on 32-bit. ... (check-in: 546cbce2 user: drh tags: trunk) | |
| 02:42 | Typo in the previous commit. ... (Closed-Leaf check-in: 383f8ef1 user: drh tags: pi4-fixes) | |
| 02:38 | Correction to the previous check-in. ... (check-in: a24f1490 user: drh tags: pi4-fixes) | |
| 02:26 |
| |
| 01:42 | Merge from trunk ... (check-in: f8263315 user: brickviking tags: bv-infotool) | |
|
2024-12-05
| ||
| 23:36 | Fix a mis-closed blockquote, as reported in forum post 2b17e349f9. ... (check-in: a69823c1 user: stephan tags: trunk) | |
| 23:15 | Fix memory leaks in merge. ... (check-in: 337617ba user: drh tags: trunk) | |
| 20:48 | Minor width adjustment for the merge-info GUI on Windows. ... (check-in: bf1af2e5 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: 1cf0d372 user: drh tags: trunk) | |
| 20:08 | Improvements to the file selection option-menu in the merge UI. ... (Closed-Leaf check-in: 4582d69e user: drh tags: better-merge) | |
| 19:22 | Improvements to the merge UI. Fix a mostly-harmless assertion associated with merge marks. ... (check-in: 48827897 user: drh tags: better-merge) | |
| 18:56 | Fix horizontal scrolling in the merge UI. ... (check-in: 06df966b user: drh tags: better-merge) | |
| 18:45 | Merge UI menu buttons working on Darwin. ... (check-in: 76b39a2c user: drh tags: better-merge) | |
| 18:00 | Improvements to how resizing works in the merge --tk UI. ... (check-in: e9d1d716 user: drh tags: better-merge) | |