Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
200 most recent check-ins
|
2024-12-21
| ||
| 22:48 | In a /timeline with me=AAA and you=BBB and rel, omit nodes that are not ancestors of BBB. This helps to better convey the changes from AAA to BBB. ... (Leaf check-in: 54e42222 user: drh tags: trunk) | |
| 00:43 | Documentation updates due to today's changes. ... (check-in: 5f872175 user: drh tags: trunk) | |
|
2024-12-20
| ||
| 21:16 | Optimize sync of long cluster chains by sending all cluster artifacts on the third client/server round-trip. ... (check-in: 637fcef8 user: drh tags: trunk) | |
| 19:50 | Further improvements to /clusterlist and to /info for a cluster. ... (check-in: 9953b169 user: drh tags: trunk) | |
| 19:44 | Edit pass on the www/ssl-server.md to cover some of the details brought up on the forum. This also adds fragment IDs for section heads and improves the discussion generally. ... (check-in: f374a463 user: wyoung tags: trunk) | |
| 19:07 | Add the "unclustered" query parameter to /bloblist. ... (check-in: 9859eb03 user: drh tags: trunk) | |
| 18:55 | Add the "recent" query parameter to the /bloblist page, to show the 250 most recently acquired artifacts. ... (check-in: 64ab7d7f user: drh tags: trunk) | |
| 16:59 | Install hyperlinks to the /clusterlist page. ... (check-in: 3057775b user: drh tags: trunk) | |
| 16:50 | Get the /clusterlist working for non-admin users, though omit sensitive information for non-admins. Show the compressed size of clusters on that page. ... (check-in: 90764bd6 user: drh tags: trunk) | |
| 15:27 | Fix a typo in a column name for the query that deals with phantom entries in the info page for clusters. ... (check-in: 72a218ce user: drh tags: trunk) | |
| 15:14 | Improvements to the /clusterlist page. ... (check-in: e3ef536c user: drh tags: trunk) | |
| 15:04 | Add the /clusterlist webpage. ... (check-in: a2ce1f10 user: drh tags: trunk) | |
| 14:38 | Improve the /info page to show more detailed information about clusters. ... (check-in: 4170e0bb user: drh tags: trunk) | |
|
2024-12-19
| ||
| 19:33 | Update the built-in SQLite to the latest trunk version for testing. ... (check-in: 1b55133f user: drh tags: trunk) | |
| 19:13 | Update to the change log for 2.26. ... (check-in: f4f395b6 user: drh tags: trunk) | |
| 18:20 | Remove a harmless unused local variable. Forum post 1d5c8db08a327fb4. ... (check-in: 08ea1bd4 user: drh tags: trunk) | |
| 16:46 | Update the tests to reflect the current state of development. ... (check-in: 6aee052f user: florian tags: trunk) | |
| 11:59 | Comment improvements in the Dockerfile ... (check-in: 693c7b9b user: wyoung tags: trunk) | |
| 07:28 | Fix a small inconvenience in the `translate' utility program discovered while working with MSVC debug builds. ... (check-in: 8defefd3 user: florian tags: trunk) | |
|
2024-12-18
| ||
| 18:40 | Fix the previous commit to restore ANSI C-89 conformance. ... (check-in: bee9b301 user: florian tags: trunk) | |
| 18:30 | Fix a problem introduced with [593ceca27d]: the blob resize operation may realloc the buffer, so obtain the pointer to the buffer only after the resize to avoid a "use after free". ... (check-in: 36bcaaee user: florian tags: trunk) | |
| 12:51 | Fix additional harmless memory leaks. ... (check-in: d564056c user: drh tags: trunk) | |
| 11:39 | Fix harmless memory leaks. ... (check-in: 37ae94b3 user: drh tags: trunk) | |
| 05:06 | Call `cgi_is_loopback()' before `db_open_local()' when checking for a local `fossil ui' session. The former performs simple string comparison, while the latter crawls the file system for multiple (3) check-out database file names at multiple directory hierarchy levels. The main motivation for this change is to reduce "attack surface" of the /jchunk interface, but also to align `cgi_is_loopback()' vs. `db_open_local()' precedence with usage elsewhere in the code base. ... (check-in: 2dda151c user: florian tags: trunk) | |
|
2024-12-17
| ||
| 12:38 | Send the --from argument of the "fossil ui" command encoded as hexadecimal, to work around quoting problems on Windows. Forum post cfc22d41b19a1a96. ... (check-in: 593ceca2 user: drh tags: trunk) | |
| 06:56 | Sync with trunk. ... (Leaf check-in: 5fbb14f7 user: florian tags: diff-word-wrap) | |
| 06:36 | Sync with trunk. ... (Leaf check-in: 361fc767 user: florian tags: diff-keyboard-navigation) | |
| 06:32 | Consistent naming of the "Hide Diff" links to skip server-side diff generation. Note the naming conflict with the scripted link to show and hide the generated diffs. ... (check-in: aa7ddd80 user: florian tags: diff-keyboard-navigation) | |
| 06:26 | Sync with trunk. ... (Leaf check-in: 215fc593 user: florian tags: timeline-keyboard-navigation) | |
| 06:24 | Take note of possibly useful shortcuts. ... (check-in: 88cba5fb user: florian tags: timeline-keyboard-navigation) | |
| 06:12 | On the new /ckout UI page, output the page footer only once. ... (check-in: 92372ce9 user: florian tags: trunk) | |
| 05:38 | Corrected an error, made some more small tweaks. ... (Leaf check-in: 728afdb0 user: brickviking tags: bv-infotool) | |
|
2024-12-16
| ||
| 20:44 | A number of small changes. Output may be minimised in a future update. ... (check-in: 27adc8b0 user: brickviking tags: bv-infotool) | |
| 20:09 | Merge from trunk. ... (check-in: 704b75e8 user: brickviking tags: bv-infotool) | |
| 20:01 | Updated changelog with new version number and text. ... (check-in: f45052a8 user: brickviking tags: bv-infotool) | |
| 16:22 | Add missing word in the help text for 'merge'. ... (check-in: bdc6bb1c user: danield tags: trunk) | |
| 16:17 | Fix a bug in the "fossil patch pull" command that caused "fossil revert" that occurs after a "fossil merge" to be lost. Also, improve "fossil patch pull" so that it does not mess with the undo log and does not do unnecessary syncs. ... (check-in: 3a39ae4c user: drh tags: trunk) | |
| 16:15 | Do not sync or fill the undo log when running subcommands due to patch. ... (Closed-Leaf check-in: cf8f0e4d user: drh tags: patch-pull-fix) | |
| 16:06 | Preliminary fix for the issue described at developers forum post 51a37054. ... (check-in: f381794f user: drh tags: patch-pull-fix) | |
| 11:46 | Restore executable bit. ... (check-in: 5fa932fa user: brickviking tags: bv-infotool) | |
| 11:43 | Added test commands. Do not rely on these commands. ... (check-in: eb116bc3 user: brickviking tags: bv-infotool) | |
| 11:09 | Merge from trunk. Sorry if this errors. ... (check-in: 91639f39 user: brickviking tags: bv-infotool) | |
| 07:40 | Internal tweaks and docs in the diff-toggling code. No visible changes. ... (check-in: 6f263954 user: stephan tags: trunk) | |
| 04:02 | Revert change. I'll have to look into the raw sql data. ... (Leaf check-in: 5a2e0042 user: brickviking tags: bv-corrections01) | |
| 03:24 | Change (temporarily) to test this forum post ... (check-in: 78a28847 user: brickviking tags: bv-corrections01) | |
| 03:20 | Merge from trunk ... (check-in: 0fc2f3d9 user: brickviking tags: bv-corrections01) | |
|
2024-12-15
| ||
| 16:30 | Documentation updates to better reflect recent changes. ... (check-in: 7f1958ac user: drh tags: trunk) | |
| 16:01 | Error checking: The argument to the --from option on the "fossil ui" command must be a pathname (not a tag or version hash). ... (check-in: 5c72725e user: drh tags: trunk) | |
| 15:57 | Change the --external-baseline option on "diff" and "ui" to be just --from. See forum thread 91ce9dd9f9afa7fe. ... (check-in: 763758db user: drh tags: trunk) | |
| 00:17 | Add the exbase=PATH query parameter to the /ckout page so that the diff uses an external baseline. Add the --external-baseline option to the "fossil ui" command to force the initial page to be /ckout with the exbase query parameter. ... (check-in: 3807891e user: drh tags: trunk) | |
| 00:15 | Add the --external-baseline option to the "fossil ui" command, to force the initial page to use the exbase query parameter. ... (Closed-Leaf check-in: 145ca85d user: drh tags: ckout-exbase) | |
| 00:06 | Improvements to /ckout with the exbase query parameter. ... (check-in: 16799dba user: drh tags: ckout-exbase) | |
|
2024-12-14
| ||
| 23:42 | Enable diff expansion with the exbase= query parameter on /ckout. ... (check-in: 4ba97a66 user: drh tags: ckout-exbase) | |
| 21:51 | Corrected method comment to make some more sense, from forum post [fdf29398a6d45] ... (check-in: 36f35492 user: brickviking tags: trunk) | |
| 21:20 | Attempt to add the exbase=PATH query parameter as an option to the /ckout page. ... (check-in: 700b5031 user: drh tags: ckout-exbase) | |
| 20:41 | Add the --external-baseline option to the "fossil diff" command, plus some minor name refactoring in the diff system. ... (check-in: 99d0baa6 user: drh tags: trunk) | |
| 20:40 | Change the name of the --tree option to --external-baseline. ... (Closed-Leaf check-in: 356163b0 user: drh tags: diff-tree) | |
| 19:57 | Fix the new --tree option so that it only shows diffs of files that prefix match arguments on the command-line. ... (check-in: df94a353 user: drh tags: diff-tree) | |
| 19:52 | Add the "--tree DIRECTORY" option to the "fossil diff" command. ... (check-in: 07a69973 user: drh tags: diff-tree) | |
| 12:00 | Recognize the --from-ckout and --to-ckout options to the "fossil diff" command. UPDATE: Development on this branch abandoned. See the nearby "diff-tree" branch for an alternative idea. ... (Closed-Leaf check-in: 28197b28 user: drh tags: diff-two-ckouts) | |
|
2024-12-13
| ||
| 23:46 | Avoid use of %R in /ckout redirect for a non-checkout to avoid the problem reported in forum post a0ecb34145. (Edit: already resolved in [02eb97d801a899ff].) ... (Closed-Leaf check-in: 7d6f6b09 user: stephan tags: mistake) | |
| 23:40 | Update the all-diffs-toggle button's label dynamically to clarify whether it will show or hide the diffs on its next click, per request in forum post 516f1ba3d82ed249. The semantics haven't changed: if any are hidden, its action will be to reveal them, else it will be to hide them. ... (check-in: 903142fe user: stephan tags: trunk) | |
| 21:37 | Begin making infrastructure changes to support doing a diff between two independently edited check-outs. ... (check-in: b10cb2b5 user: drh tags: diff-two-ckouts) | |
| 17:42 | Missed help screen update. ... (check-in: e5093a9c user: florian tags: diff-keyboard-navigation) | |
| 17:11 | Sync with trunk. ... (check-in: 4d727776 user: florian tags: diff-word-wrap) | |
| 17:07 | Enable keyboard navigation for web UI diffs on the new /ckout page. Restore the "Hide Diff" links (at least temporarily), so the keyboard handler can access the URLs. ... (check-in: 9e216433 user: florian tags: diff-keyboard-navigation) | |
| 17:01 | Sync with trunk. ... (check-in: edda30c6 user: florian tags: diff-keyboard-navigation) | |
| 15:36 | Fix redirect for the misuse of /ckout. ... (check-in: 02eb97d8 user: drh tags: trunk) | |
| 13:52 | Change the "sectionmenu" for the diffs on the /ckout page to be just a <hr>. ... (check-in: 8b06e7c0 user: drh tags: trunk) | |
| 13:29 | Attempts at beautification: (1) Simplify names of some links/buttons in diff pages. (2) Omit the "Hide Diffs" links, as those are now redundant. (3) Remove the accordion menu from the /ckout page. ... (check-in: 4d2d62d0 user: drh tags: trunk) | |
| 12:50 | Add the info-changes-menu to the "Uncommitted Changes" section of the /ckout page. ... (check-in: 7cf712af user: drh tags: trunk) | |
| 12:19 | Add accordion panels to the /ckout page. ... (check-in: 4af5cde6 user: drh tags: trunk) | |
| 12:00 | Fix the /ckout page so that it works correctly even when invoked from a subdirectory of the checkout root. Forum post af6086e46b. ... (check-in: 242c2d18 user: drh tags: trunk) | |
| 10:53 | Reworded section introductions, tidying up some of my writing. ... (check-in: e9b7d3f5 user: brickviking tags: bv-infotool) | |
| 10:01 | Corrected dir entry (again) in emitted header. ... (check-in: e8de1b3e user: brickviking tags: bv-infotool) | |
| 09:17 | Corrected dir entry in emitted header. ... (check-in: ac92f9d6 user: brickviking tags: bv-infotool) | |
| 09:09 | Add fossil to system-wide dir file when running install-info. ... (check-in: d78a077a user: brickviking tags: bv-infotool) | |
| 08:47 | Sync with trunk. ... (check-in: a1f60bee user: florian tags: diff-word-wrap) | |
| 04:03 | Tidied up language in add.c. ... (check-in: 3d2f1886 user: brickviking tags: trunk) | |
| 00:41 | Diff toggles: move the toggle-all button into the page-level diff UI controls (and add that area to the /ckout page) and only show the toggle-all option if more than one diff is being shown. Only show the Sync-sbs-diff preference checkbox when rendering sbs diffs. There is some slight visual inconsistency across various pages in how the toggle-all button is rendered, so there's still opportunity for some polishing-up. ... (check-in: a718a768 user: stephan tags: trunk) | |
|
2024-12-12
| ||
| 17:07 | Sync with trunk. ... (check-in: 878a56bc user: florian tags: diff-word-wrap) | |
| 17:00 | Sync with trunk. ... (check-in: 6599ed91 user: florian tags: diff-keyboard-navigation) | |
| 16:58 | Sync with trunk. ... (check-in: 611f20e8 user: florian tags: timeline-keyboard-navigation) | |
| 11:36 | On the /ckout page, omit the diff if the diff parameter is 0 or smaller. ... (check-in: 0654e845 user: drh tags: trunk) | |
| 08:16 | Rename of infoscript to fossil-makeinfo. ... (check-in: 4c006c97 user: brickviking tags: bv-infotool) | |
| 07:42 | Changes to infoscript necessary for OpenBSD's makeinfo, which dates to 2004. A rename is coming. ... (check-in: a28bcf55 user: brickviking tags: bv-infotool) | |
| 06:48 | Fix of file-change-line button. ... (check-in: 8e3e57b3 user: brickviking tags: trunk) | |
| 06:33 | Widen the scope for a button's visibility in darkmode. ... (check-in: 19da71c5 user: brickviking tags: trunk) | |
| 04:49 | Increase contrast of button for file-change-line. ... (check-in: 426dd8d3 user: brickviking tags: trunk) | |
| 03:37 | Fix DOM element pairing when diff=0 is used in /vdiff and friends. Problem introduced in [a11d2454782]. ... (check-in: d463c7ee user: stephan tags: trunk) | |
|
2024-12-11
| ||
| 23:09 | Diff toggles: add a label to the checkbox to make it easier to click, add an 'all' button which toggles all diffs, and remove the toggle from the /fdiff page because it only has a single diff block. ... (check-in: a11d2454 user: stephan tags: trunk) | |
| 23:02 | Diff toggles: add a label to the checkbox to make it easier to click, add an 'all' button which toggles all diffs, and remove the toggle from the /fdiff page because it only has a single diff block. ... (Closed-Leaf check-in: 419756c6 user: stephan tags: diff-toggle-all) | |
| 20:52 | Tweaked language a bit. ... (check-in: 2c0714f8 user: brickviking tags: trunk) | |
| 11:41 | Record the name of the branch for a checkout when the checkout is first opened. Possible use later to warn about branch name changes at check-in time. ... (Leaf check-in: 706a10d0 user: drh tags: safe-checkout-branch) | |
| 07:41 | (Spell) Correct spelling in branch.c. ... (check-in: 4bb718a8 user: brickviking tags: trunk) | |
| 00:32 | More robust detection of top of a checkout in the dir_has_ckout_db() function. ... (check-in: 36f916c5 user: drh tags: trunk) | |
|
2024-12-10
| ||
| 21:30 | (Grammar) Correct sense of word. ... (check-in: c7bfa963 user: brickviking tags: trunk) | |
| 20:56 | Add an optional REMOTE:PATH term on the "fossil bisect ui" command that runs the UI on the specified remote check-out. ... (check-in: a865c62a user: drh tags: trunk) | |
| 20:44 | More improvements to the title of the /ckout page. Add a link to the /ckout page from the /sitemap, when the /ckout page is valid. ... (check-in: 3f6a7e51 user: drh tags: trunk) | |
| 20:28 | Update the change log. ... (check-in: e850ce1c user: drh tags: trunk) | |
| 19:18 | Further improvements to the title of the ckout page. ... (check-in: 726709d9 user: drh tags: trunk) | |
| 18:24 | Improved title on the /ckout page. ... (check-in: 842daebb user: drh tags: trunk) | |
| 18:18 | Try to always use /ckout as the start page for "fossil ui" invocations, even on remote hosts, unless something else is specified by the user. ... (check-in: 58849c40 user: drh tags: trunk) | |
| 16:57 | Change the default page for the "fossil ui" command to the new /ckout page. ... (check-in: db2f3097 user: drh tags: trunk) | |
| 13:58 | If the "fossil diff" command has a directory argument, then run a "fossil ui" diff on that check-out. ... (Closed-Leaf check-in: 099ed5b9 user: drh tags: diff-remote) | |
| 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. ... (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. ... (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) | |
| 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: 873b364b user: drh tags: better-merge) | |
| 17:00 | Add a new "SUGGESTED CONFLICT RESOLUTION" section to the conflict markings. ... (check-in: adf22696 user: drh tags: better-merge) | |
| 13:24 | Reduced memory requirements in merge_try_to_resolve_conflict(). ... (check-in: 16515616 user: drh tags: better-merge) | |
| 13:16 | Bug fixes sufficient to get the automated merge conflict resolution working. ... (check-in: 1174e5f2 user: drh tags: better-merge) | |
| 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: 849c7eb6 user: drh tags: better-merge) | |
|
2024-12-04
| ||
| 19:25 | Fix rendering of merge information that contains "N" entries followed by "S". ... (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. ... (Closed-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) | |