Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
292 check-ins using file src/merge.c version 0d0cf4b86f
|
2022-10-19
| ||
| 17:22 | Fix the handling of manifest files for the "tag" and "amend" commands. Leaf check-in: a233560424 user: drh tags: branch-1.37 | |
|
2017-12-03
| ||
| 02:11 | Fix the setting of authorized editors on the new skin page. Closed-Leaf check-in: d8846443b4 user: drh tags: skin-setup-refactor | |
| 01:57 | On the Skins admin page, add Step 8 which gives administrators a link to the legacy Skin control page, with updates to deal with drafts. check-in: 49d923bd81 user: drh tags: skin-setup-refactor | |
| 01:29 | Improvements and fixes to the new skin editing. check-in: 38762b9f6c user: drh tags: skin-setup-refactor | |
|
2017-12-02
| ||
| 21:48 | Improvements to the skin file editing. check-in: 2179ffd47a user: drh tags: skin-setup-refactor | |
| 21:24 | The new skin editing is working, minimally. Still needs lots of work, though. check-in: 5840fdd732 user: drh tags: skin-setup-refactor | |
| 16:22 | The URL parser now understands the /draftN/ prefix. Draft skins can now be initialized from built-ins. Another incremental check-in. check-in: 0cba37ec1a user: drh tags: skin-setup-refactor | |
| 14:39 | Rework the Setup/Skin page so that all edits are done on a draft, then tested, then the draft is published to become the default skin. This specific check-in is just the beginning. Must code needs to be added. This is just an incremental check-in. check-in: 9bafe6cb60 user: drh tags: skin-setup-refactor | |
|
2017-11-30
| ||
| 19:42 | Fix an 'auto.def' issue that prevented using --with-tcl of a static Tcl with --static. check-in: 28fd1c1bd4 user: mistachkin tags: trunk | |
| 12:57 | Remove unused "#if 0...#endif" code from finfo.c. check-in: 563d481e6a user: drh tags: trunk | |
| 12:55 | Add the --allow-symlinks option to the test-file-environment command. check-in: cf1960e913 user: drh tags: trunk | |
| 11:50 | eliminate unused variables check-in: c699e9fedf user: jan.nijtmans tags: trunk | |
| 11:34 | Fix the default CSS diff coloring, broken by check-in [5c9c51be5f033de2] check-in: 3b988301c7 user: drh tags: trunk | |
| 10:15 | Eliminate fossil_utf8_to_console() for non-windows platforms: it isn't used then. Thanks to "bytevolcano" for the suggestion. check-in: 434adc35fc user: jan.nijtmans tags: trunk | |
| 05:09 | Still more improvements to the test-file-environment command. check-in: 8434738204 user: drh tags: trunk | |
| 04:48 | Improvements to the test-file-environment command. check-in: fdc6af2315 user: drh tags: trunk | |
| 04:22 | Improve the text of the meaning of the allow-symlinks setting. No changes to code. check-in: a59c8490dd user: drh tags: trunk | |
| 00:27 | Fix an problem with the MSC makefile. check-in: 75fd7afcde user: drh tags: trunk | |
| 00:22 | Fix an issue with mkcss.c that gcc was ok with but failed on msvc. check-in: 5c30108909 user: drh tags: trunk | |
|
2017-11-29
| ||
| 19:18 | Generate the big cssDefaultList table in the middle of style.c using default_css.txt as the source. The default_css.txt file will be easier to understand, edit, and comment. check-in: 5c9c51be5f user: drh tags: trunk | |
| 16:20 | Futher adjustments to the default CSS for timeline selection and "current". check-in: f9fc914eae user: drh tags: trunk | |
| 16:06 | Adjustments to the default CSS for timeline tables to better display the selected row. check-in: 5beb361496 user: drh tags: trunk | |
| 14:48 | tiny doc typo fix. check-in: 487b39081d user: stephan tags: trunk | |
| 14:05 | The /timeline supports 4 sticky viewing modes: Modern, Verbose, Compact, and Columnar. The new cookie.c module supports sticky user viewing preferences. check-in: c94f608548 user: drh tags: trunk | |
| 14:02 | All timelines use the "ss" display preferences cookie. Closed-Leaf check-in: 6314b4ed94 user: drh tags: sticky-timeline-style | |
| 13:25 | Add the "View" selector to the /finfo page. check-in: e36f693f7a user: drh tags: sticky-timeline-style | |
| 11:46 | Change the name of "Normal View" to "Modern View". Add the "View" modifier to all choices in the view mode selector, to help make it clear what the selector is for. check-in: 2a8598f987 user: drh tags: sticky-timeline-style | |
| 03:41 | In "Verbose" mode, put the hash up front, as was done with legacy. check-in: 59980b6082 user: drh tags: sticky-timeline-style | |
| 02:59 | Remove the "border-collapse: collapse;" default CSS from the /timeline. check-in: 926a5a38df user: drh tags: sticky-timeline-style | |
| 02:48 | Fixes to default styling. check-in: e814b1e583 user: drh tags: sticky-timeline-style | |
| 02:29 | Change the name of the "Detailed" mode on /timeline to "Verbose". check-in: c0a3a90b28 user: drh tags: sticky-timeline-style | |
| 02:20 | Fixes to the cookie handler. Simpler class structure on timelines. check-in: 92af2148fb user: drh tags: sticky-timeline-style | |
|
2017-11-28
| ||
| 22:16 | Improvements to handling of the cookie for "sticky" display settings. check-in: 3ec843970d user: drh tags: sticky-timeline-style | |
| 21:43 | Change the style selector query parameter on /timeline to "ss". Other code cleanup. The new style selector is working, but needs default CSS. check-in: f64fa4f1ae user: drh tags: sticky-timeline-style | |
| 19:41 | Work toward getting the mode selector to work on /timeline. This check-in is incomplete and is intended only to transfer code between machines. check-in: fdf071e181 user: drh tags: sticky-timeline-style | |
| 16:42 | Add the /cookies page for debugging. (Maybe that page can be expanded to allow users to edit their preferences?) Use sticky values for the "n=" and "y=" query parameters on timelines. check-in: 0f446ca69d user: drh tags: sticky-timeline-style | |
| 15:42 | The intent of this branch is to refactor /timeline comment rendering, giving the user multiple display options, and making the option sticky in the sense that the option selected most recently becomes the new default. This is an incremental check-in containing infrastructure cookie-handling logic. check-in: bc8947d1dc user: drh tags: sticky-timeline-style | |
|
2017-11-27
| ||
| 17:50 | Remove an unused function from the timeline logic. check-in: 50376e4b36 user: drh tags: trunk | |
| 16:03 | Add a setup parameter under Setup/Timeline for configuring the default number of entries in a timeline that lacks an n= query parameter. check-in: eed877c0a5 user: drh tags: trunk | |
| 11:26 | Omit query parameters from the /timeline view of search results. Use the defaults. check-in: cde6cbfc9d user: drh tags: trunk | |
| 00:13 | The /timeline page shows check-ins only if there is no y= query parameter and if the user has read ("r") permissions on the repo. check-in: 255adb04fe user: drh tags: trunk | |
|
2017-11-26
| ||
| 23:53 | Avoid drawing two consecutive ellpses when the timeline comment has been truncated. check-in: d1aa1e6275 user: drh tags: trunk | |
| 23:29 | Remove a leftover "basic" query parameter on an internal /timeline line. Change the default number of entries shown for "c=" timelines to 50, as this works better with the new centering logic. check-in: 6e9748b6a8 user: drh tags: trunk | |
| 23:19 | If there is a selection or marked entry, scroll the /timeline so that the marked entry as as close to the middle of the screen as we can get, upon initial display of the timeline. check-in: 66e6c97bd4 user: drh tags: trunk | |
| 17:49 | Fix a problem in the /info page for check-ins wherein it was not showing the links to the descendents graph. check-in: 6fe8d46106 user: drh tags: trunk | |
| 15:47 | Use three U+002e characters to form the ellipsis in timelines, rather than the U+22ef, since some browsers do not know how to render U+22ef. check-in: 1b78291f08 user: drh tags: trunk | |
| 11:14 | Change the default CSS so that the cursor is a pointer over the timeline check-in comment and the following ellipsis, as a hint to that one can click on those elements. check-in: b39ad68f7c user: drh tags: trunk | |
| 02:23 | Clicking on the ellipsis expands the (detail) section in a timeline. check-in: a794d858ec user: drh tags: trunk | |
| 02:04 | Add a Help submenu item to the /timeline page, so that advanced users can quickly see all of the query parameters, and perhaps start to enter them directly on the URL. check-in: 44a5ac416e user: drh tags: trunk | |
| 01:41 | Default the /timeline format to "comment (detail)". check-in: 58cfff2a4a user: drh tags: trunk | |
| 01:37 | The javascript Advanced/Basic toggles on the timelines is working well enough now to merge to trunk. check-in: e91d267205 user: drh tags: trunk | |
| 01:34 | Replace the three bullets with a midline ellipsis character in the timelines. Closed-Leaf check-in: 7b9cfa99c3 user: drh tags: declutter-via-js | |
| 01:29 | Fix a javascript error in toggleEllipsis() in the /timeline. check-in: 4d6fda6de4 user: drh tags: declutter-via-js | |
| 01:25 | Clicking anywhere on the comment field of a /timeline toggles the (detail) on/off. The ellipsis is no longer a hyperlink. check-in: 83bb8a8674 user: drh tags: declutter-via-js | |
| 00:41 | Default CSS for timeline ellipsis. check-in: 9b739d1d93 user: drh tags: declutter-via-js | |
| 00:37 | For the ellipses in timelines from three bullet characters. check-in: cef3d63c54 user: drh tags: declutter-via-js | |
|
2017-11-25
| ||
| 21:21 | Add the javascript Advanced/Basic buttons to the /finfo timeline. check-in: 6eaad787a8 user: drh tags: declutter-via-js | |
| 20:43 | On the /timeline page, begin with the "basic" view. Provide an "Advanced" button to fill in details using JS. The "basic" query parameter no longer functions. check-in: 3ede2d874f user: drh tags: declutter-via-js | |
| 12:26 | Change the names of the "Basic" and "Advanced" buttons to "Declutter" and "Details". (These names are subject to further refinement.) Add a [checkins-using] link to the artifact view for content artifacts. check-in: e72444ea6a user: drh tags: trunk | |
| 02:15 | Add a "Basic" button to the submenu for /timeline pages that do not already have the "basic" query parameter. check-in: 227c8e57fa user: drh tags: trunk | |
| 01:55 | Suppress the "Related" checkbox on the submenu of /timeline when the basic query parameter is enabled. check-in: a46b9e772c user: drh tags: trunk | |
| 01:41 | Fix typos and improve the text description of the "Comment Format" setting. check-in: a339c94fd3 user: drh tags: trunk | |
|
2017-11-24
| ||
| 23:53 | Make the "basic" query parameter the default for built-in skins when clicking on the Timeline menu. Add "basic" to /finfo. Other improvements to timeline. check-in: 78f18dbd1c user: drh tags: trunk | |
| 22:35 | Add the "basic=1" query parameter to /timeline, to declutter the display. check-in: 5ec5a403ae user: drh tags: trunk | |
| 21:51 | On the /timeline and /finfo pages, change the hyperlinks under the timestamp to point to the object referenced. This allows the timeline to be configured for "comment-only" but still provide a link to the object. check-in: 77dfcc91ed user: drh tags: trunk | |
| 20:46 | New class "timelineDetailCell" for all <td> elements that hold the separate detail column of a timeline. check-in: b39985508b user: drh tags: trunk | |
| 20:30 | Add a new timeline format that puts the details in a separate table column from the check-in comment. check-in: dbb7447372 user: drh tags: trunk | |
| 20:10 | Provide a configuration option that can move the hash in a timeline before the comment, after the comment, or into the details, and can omit the details span. check-in: 4102f60846 user: drh tags: trunk | |
| 20:04 | Add the "Comment Format" selector for to the /setup_timeline page. This allows the admin to configure the timeline comment display in various ways, so that nearly all preferences are satisfied. Closed-Leaf check-in: 4cb350ecc0 user: drh tags: timeline-improvements | |
| 16:25 | New <span> element with the timelineExtraLinks class for the hyperlinks at the end of each entry on the /finfo page. check-in: 1186f65ec5 user: drh tags: timeline-improvements | |
| 16:06 | Restore this display of "Leaf" and "Closed-Leaf" but now put it after the check-in comment. check-in: 2df238e5ab user: drh tags: timeline-improvements | |
| 14:19 | Give greater emphasis to the check-in comment on timeline displays. Move the check-in hash into the details section at the end of each entry. check-in: 4438e68de3 user: drh tags: timeline-improvements | |
|
2017-11-22
| ||
| 19:01 | Improvements to the coding-style guidelines from Johan Kuuse. check-in: 49cde9fcaf user: drh tags: trunk | |
|
2017-11-18
| ||
| 19:58 | Improvements to the "Fossil Build Process" documentation, with improved comments in related source files. No changes to real code. check-in: 51cf75088c user: drh tags: trunk | |
| 17:49 | Fix a crash that can occur in search when the FTS4 snippet() function returns NULL. check-in: cee4af9e9c user: drh tags: trunk | |
|
2017-11-16
| ||
| 02:43 | Fix key bindings on the "fossil diff --tk" command. Control-q now exits. Pressing Enter does the right things at the right times and does not raise errors. Etc. check-in: 4dfa592f27 user: drh tags: trunk | |
|
2017-11-14
| ||
| 21:52 | Add section for version 2.5 to the change log. check-in: d02c1042a5 user: drh tags: trunk | |
| 21:48 | Increase the version number to 2.5. check-in: 155e52934c user: drh tags: trunk | |
| 21:47 | Update the built-in SQLite to a version that supports read-only access to WAL-mode databases. check-in: 6ef13e21d4 user: drh tags: trunk | |
|
2017-11-10
| ||
| 10:55 | merge trunk. Upgrade to openssl 1.1.0g check-in: 9d3560b885 user: jan.nijtmans tags: openssl-1.1 | |
| 10:30 | (cherry-pick): Upgrade to openssl 1.0.2m Closed-Leaf check-in: 3003decb4e user: jan.nijtmans tags: branch-2.4 | |
| 10:28 | Upgrade to openssl 1.0.2m check-in: 5310f2ba88 user: jan.nijtmans tags: trunk | |
|
2017-11-08
| ||
| 15:24 | Fix the --with-tcl=PATH option on the configure script using a one-character patch suggested by Christoph Iserlohn. check-in: 23c8937d70 user: drh tags: trunk | |
| 15:20 | (cherrypick): update win/Makefile.mingw.mistachkin check-in: 4a9ce01b5c user: jan.nijtmans tags: branch-2.4 | |
| 15:13 | update win/Makefile.mingw.mistachkin check-in: 35751600d9 user: jan.nijtmans tags: trunk | |
|
2017-11-04
| ||
| 14:56 | Change the "/wiki_rules" page so that it displays a wiki source file, either formatted or plain-text, just like /md_rules does. check-in: bf69c6ebc9 user: drh tags: trunk | |
| 13:16 | Fix a minor typo in a comment. No changes to code. check-in: 9b20b8a18c user: drh tags: trunk | |
|
2017-11-03
| ||
| 13:34 | Automatically generate the <html><head>...</head><body> section at the beginning of each HTML document if the header template does not contain a <body> tag. Likewise for the </body></html> after the footer. check-in: f1bb72ed26 user: drh tags: trunk | |
| 12:54 | Changed the color of the Reader privilege subscript to be more readable in the Xekri skin. check-in: bfbcc126d3 user: zakero tags: trunk | |
| 09:29 | Version 2.4 check-in: a0001dcf57 user: drh tags: trunk, release, version-2.4 | |
| 06:46 | Fix harmless compiler warning. check-in: 5aa37859d0 user: mistachkin tags: trunk | |
| 06:30 | Fix segfault in status, et al, when a file in the checkout cannot be opened. check-in: 3c6d23b752 user: mistachkin tags: trunk | |
|
2017-10-30
| ||
| 13:22 | Fix a typo that prevented the diff-binary setting from being picked up by the mkindex.c comment scanner. check-in: 2eea7584d5 user: drh tags: trunk | |
| 13:20 | Add a blank entry to the end of the Setting array so that loops can be terminated by checking for a null zName pointer. check-in: df654bd993 user: drh tags: trunk | |
|
2017-10-29
| ||
| 23:59 | Update the 2.4 change log. check-in: 266a311b62 user: drh tags: trunk | |
|
2017-10-27
| ||
| 15:06 | Fix broken hyperlinks on the tech_overview.wiki page. check-in: 3018d519c8 user: drh tags: trunk | |
|
2017-10-24
| ||
| 20:52 | Update the built-in SQLite to version 3.21.0 final. check-in: c7e55d9cac user: drh tags: trunk | |
|
2017-10-21
| ||
| 19:37 | Update the built-in SQLite to the second 3.21.0 beta. check-in: 7ac19afae3 user: drh tags: trunk | |
|
2017-10-19
| ||
| 20:39 | Initial changes for adding attachments to check-ins. Closed-Leaf check-in: cb385ba009 user: drh tags: checkin-attachment | |
| 08:47 | typo fix reported on the ML. check-in: 1374d58142 user: stephan tags: trunk | |
| 04:09 | Adjust help text wording for /download page check-in: eecb721e04 user: andygoth tags: trunk | |
| 03:49 | Minor fixes to wording of the TH1 hooks docs. check-in: 38fabd4950 user: mistachkin tags: trunk | |
|
2017-10-17
| ||
| 23:03 | In the "fossil all ui" command, shows the "(hidden)" mark after repos that contain "/." in their pathnames. check-in: b82bdff789 user: drh tags: trunk | |
| 21:06 | Add the /download page, with a configuration option to define what tag to be downloaded. check-in: c5fea125d9 user: drh tags: trunk | |
|
2017-10-16
| ||
| 13:54 | Improvements to automatic hyperlink enabling and robot exclusion. check-in: f014e15660 user: drh tags: trunk | |
|
2017-10-14
| ||
| 23:20 | Update /dir to support readme and readme.* files being a symlink to the actual document. Symlinks to symlinks are not supported in this instance. The document type is determined by the link target name. Closed-Leaf check-in: eb4dda4820 user: andygoth tags: andygoth-doc-symlink | |
| 22:49 | Remove unnecessary double NUL-termination from blob Closed-Leaf check-in: 95b6fad941 user: andygoth tags: andygoth-enhanced-symlink | |
| 22:22 | Update change log to describe Windows behavior of "l" flag to "manifest" setting check-in: 810370cd43 user: andygoth tags: andygoth-enhanced-symlink | |
| 22:19 | Correct sense of _WIN32 conditional compilation check-in: 1226e3ef52 user: andygoth tags: andygoth-enhanced-symlink | |
| 22:03 | Use transactions while creating symlink_perm table check-in: f42ee09a09 user: andygoth tags: andygoth-enhanced-symlink | |
| 22:03 | Additional corrections to Windows symlink permissions logic check-in: f29c8a44be user: andygoth tags: andygoth-enhanced-symlink | |
| 21:48 | Tweak comment style for consistency within functions check-in: 364d04315b user: andygoth tags: andygoth-enhanced-symlink | |
| 21:44 | Correct vfile_check_signature() handling of manifest.symlinks not existing or manifest setting not containing the l flag check-in: de50c496d2 user: andygoth tags: andygoth-enhanced-symlink | |
| 21:43 | Update Windows version of vfile_check_signature() to get symlink status from manifest.symlinks check-in: 23e67f67d0 user: andygoth tags: andygoth-enhanced-symlink | |
| 21:37 | Protect against symlink_perm table already existing, should get_checkout_symlink_table() have already been called check-in: 03ba3d9cb2 user: andygoth tags: andygoth-enhanced-symlink | |
| 21:32 | Move manifest.symlinks read functionality into the new get_checkout_symlink_table() function in checkout.c check-in: 7a4bd5cf83 user: andygoth tags: andygoth-enhanced-symlink | |
| 21:13 | When committing on Windows with the "l" manifest flag set, update the symlink permission for selected files from the manifest.symlinks file if it exists check-in: 2808e22596 user: andygoth tags: andygoth-enhanced-symlink | |
| 19:32 | Correct help text for open command check-in: 109c956ff1 user: andygoth tags: andygoth-enhanced-symlink | |
| 19:28 | Merge trunk check-in: 057645a938 user: andygoth tags: andygoth-enhanced-symlink | |
|
2017-10-13
| ||
| 08:43 | Update autosetup to 0.6.8 (v0.6.7-11-g3eb780c) Closed-Leaf check-in: 2ed09fb8a3 user: steveb tags: autosetup | |
|
2017-10-12
| ||
| 13:37 | Rewrote the autoreconfigure explanation comment. It was confusing and contained errors. check-in: 50844e5c6b user: wyoung tags: trunk | |
|
2017-10-11
| ||
| 19:56 | Removed the GNU make conditional around the new autoreconfigure dependency rule in the top-level Makefile.in. Apparently we have users using some other make, perhaps BSD make. Since the conditional only prevents autoreconfigure in the "make clean" case, where it is a minor annoyance, it's not important to work out how to retain this in a non-GNU ... check-in: 454e119398 user: wyoung tags: trunk | |
| 10:13 | Merge the automatic reconfigure changes. check-in: 67a9088237 user: drh tags: trunk | |
| 01:30 | Merged in an upstream improvement from Autosetup addressing GH issue in a different output file. That in turn requires an adjustment to our new autoreconfigure feature to avoid a make(1) loop. Closed-Leaf check-in: 1d549aa879 user: wyoung tags: wy-autoreconfig | |
| 01:23 | Small path fix to the new autoreconfigure Makefile rule. check-in: b923d8006e user: wyoung tags: wy-autoreconfig | |
| 01:16 | Automatically re-configuring (same as "make reconfig") when Makefile.in, src/main.mk, or one of the autosetup files changes. This should avoid the need to recommend to people "re-run configure" whenever they call "fossil update" on this tree. check-in: c649ba2770 user: wyoung tags: wy-autoreconfig | |
| 01:13 | Added "reconfig" target to the top-level Makefile, which uses an autosetup feature to re-run configure with the same options you gave manually. check-in: fd33b6a4aa user: wyoung tags: wy-autoreconfig | |
|
2017-10-10
| ||
| 23:08 | Fix the on-line help for the pgo-command and gdiff-command settings. check-in: 7aad2af7d3 user: drh tags: trunk | |
|
2017-10-06
| ||
| 16:36 | Improved help message for the /mlink page check-in: bf94ffa009 user: drh tags: trunk | |
|
2017-10-05
| ||
| 11:41 | Only show hyperlinks to the /mlink page to admin users. check-in: dead084ee5 user: drh tags: trunk | |
| 11:37 | Delta checksum verification is disabled by default, for better performance. It can be reenabled using -DFOSSIL_ENABLE_DELTA_CKSUM_TEST. check-in: d3a46b2a45 user: drh tags: trunk | |
| 11:03 | Minor formatting changes the the /mlink page. check-in: a73ed0d2f5 user: drh tags: trunk | |
| 10:02 | Fix a hyperlink on the /mlink page. Add a link from /info for a check-in to the /mlink page under "Other Links". check-in: 180128f523 user: drh tags: trunk | |
|
2017-10-04
| ||
| 12:07 | Don't duplicate title in body check-in: 5ab4db5a16 user: mpcjanssen tags: commonmark-markdown | |
| 11:37 | Simplify title determining code check-in: b36643651c user: mjanssen tags: commonmark-markdown | |
| 10:59 | Add support for markdown page titles check-in: 4a298e69ec user: mjanssen tags: commonmark-markdown | |
| 05:35 | Improvement to TH_RETURN handling needed for TH1 hooks. Update and correct TH1 hook tests. Add draft documentation for TH1 hooks. check-in: 36f0e47b32 user: mistachkin tags: trunk | |
|
2017-10-03
| ||
| 14:42 | Tweak indenting for consistency check-in: 5f37eb84ca user: andygoth tags: trunk | |
| 05:12 | Follow-up to [f39c33c133]: Only add extra table cell when rcvid column is shown check-in: 1f9718a694 user: andygoth tags: trunk | |
|
2017-10-02
| ||
| 16:25 | Avoid large SQL inserts when computing the path between two check-ins for use by reverse annotation. check-in: 5eba557c22 user: drh tags: trunk | |
| 15:23 | Add docs and tests for the TH1 'string index' command added by check-in [0c57ba3eb4]. Also, fix issue with handling of the special 'end' index. check-in: e9845e5904 user: mistachkin tags: trunk | |
| 12:22 | More fixes to reverse annotation via the /fdiff page. It is closer, but it is still not right. check-in: 08cacbf6e5 user: drh tags: trunk | |
| 11:56 | Fix the origin= and checkin= query parameters on the "Annotate" link of the /fdiff page. check-in: a9ef45ed06 user: drh tags: trunk | |
| 03:46 | Update the build-in SQLite to the latest 3.21.0 beta that includes the enhance use of co-routines for subqueries. check-in: 75fffb49ce user: drh tags: trunk | |
| 02:30 | Fix the computation of the percentage of the repo taken up by unversioned files on the /stat page. check-in: c8b46764b6 user: drh tags: trunk | |
|
2017-09-30
| ||
| 01:09 | Add [string index] TH1 command check-in: 0c57ba3eb4 user: andygoth tags: trunk | |
|
2017-09-29
| ||
| 00:53 | Add support for the "l" flag to the "manifest" setting to enable creation of a file "manifest.symlinks" which lists the names of all symlinks check-in: 8d6bdd1e00 user: andygoth tags: andygoth-enhanced-symlink | |
|
2017-09-28
| ||
| 18:18 | Fix indentation of unanalyzed lines on /annotate and /blame screens. check-in: 00ced6df65 user: drh tags: trunk | |
|
2017-09-27
| ||
| 03:23 | Assorted cleanups associated with [f74f7014], most notably making "fossil dif" work again despite the ambiguity with setting "diff-command" check-in: 2b6a34c7e4 user: andygoth tags: trunk | |
| 02:33 | Take the "Built-in Documents" section back out, as all of referenced documents are already available in other parts of the same page. check-in: fd9fd4c9e6 user: drh tags: trunk | |
| 02:28 | Add the /sitemap page to the list of built-in documents. check-in: 3dc6d73602 user: drh tags: trunk | |
| 02:20 | Add the "Built-in Documentation" section to the main documentation page. check-in: 2bacd55938 user: drh tags: trunk | |
| 02:10 | Add the orig= query parameter to the /finfo webpage. Use this in the hyperlink from the analysis log of the /annotate page. check-in: 95cc4b90da user: drh tags: trunk | |
|
2017-09-26
| ||
| 20:41 | The revision numbers in the annotate output were off by one check-in. This changes should fix the problem. check-in: 0b4c3f5a28 user: drh tags: trunk | |
| 14:47 | Update dirent to Version 1.23.1 check-in: 398a90c006 user: jan.nijtmans tags: trunk | |
| 14:46 | Fix double "However" in comment. Some more end-of-line spacing. Nothing functional. check-in: ce1bc4fb09 user: jan.nijtmans tags: trunk | |
| 03:56 | Provide a link to the reverse annotation for an /fdiff of two versions of the same file. Improvements to the description of a reverse annotation. check-in: f52a544942 user: drh tags: trunk | |
|
2017-09-25
| ||
| 19:46 | Update the change log. Improved documentation of reverse annotations. (Note: The check-in time has been moved 5 minutes earlier as a test of the ability to edit check-in times.) check-in: 1f378f9e31 user: drh tags: trunk | |
| 18:32 | Add the origin= query parameter to /annotate and the --origin option to the annotation command, to enable reverse annotations. check-in: c91b810620 user: drh tags: trunk | |
| 17:24 | Improved limit handling for annotation. The limit can now be expressed in compute-time seconds rather than versions analyzed, and defaults to "1.0s", which is enough to compute a complete annotation on most reasonable files. check-in: 517b9a5652 user: drh tags: trunk | |
| 15:36 | Change the "Log" submenu element of the annotation page so that it shows or hides the log using javascript, avoiding a server roundtrip and a recomputation of the annotation. check-in: 037e06b370 user: drh tags: trunk | |
| 15:28 | Merge search-technote check-in: a551d503c2 user: andygoth tags: trunk | |
| 15:18 | Merge miscellaneous changes that have accumulated on the annotation-enhancements branch. See a log of the whole branch for details. check-in: ab8ed318e7 user: drh tags: trunk | |
| 12:45 | Simplified and improved implementation of annotate_file(). Closed-Leaf check-in: d2b1565b7c user: drh tags: andygoth-annotation-enhancements | |
|
2017-09-24
| ||
| 10:58 | The annotate_file() function is now closer to being correct, but is still not quote right. check-in: 54c0dab0c6 user: drh tags: andygoth-annotation-enhancements | |
| 09:39 | Remove unused local variables that caused breakages with -Werror. To do: This branch still gives a very different answer than trunk for /annotate?limit=-1&checkin=8e27a5a0&filename=src/login.c&log=1 check-in: 120ff0b8a3 user: drh tags: andygoth-annotation-enhancements | |
| 04:42 | Use tables throughout globs.md check-in: 7f2689b1b5 user: andygoth tags: andygoth-annotation-enhancements | |
| 04:41 | Correct name of extras command check-in: 4546d93da3 user: andygoth tags: andygoth-annotation-enhancements | |
| 04:33 | Correct typo preventing "fossil help clean-glob" from working check-in: 41162e1ac5 user: andygoth tags: andygoth-annotation-enhancements | |
| 04:12 | Update change log Closed-Leaf check-in: f914bfd3c7 user: andygoth tags: andygoth-search-technote, andygoth-annotation-enhancements | |
| 04:06 | Fix some bugs in tech note search indexing check-in: 76f8bfd5f9 user: andygoth tags: andygoth-search-technote, andygoth-annotation-enhancements | |
| 03:10 | Add missing call to search_update_technote_index() check-in: 467512031f user: andygoth tags: andygoth-search-technote, andygoth-annotation-enhancements | |
| 03:02 | Correct alignment of fts-config output check-in: a6c7ce9db8 user: andygoth tags: andygoth-search-technote, andygoth-annotation-enhancements | |
| 00:10 | Begin work on searching technotes. Credit goes to Chris Rydalch for the idea. Sadly, this version doesn't work yet. Technote searches fail at this time. check-in: 94650be8de user: andygoth tags: andygoth-search-technote, andygoth-annotation-enhancements | |
|
2017-09-23
| ||
| 21:52 | Convert /fdiff and (partially) /vdiff to use checkboxes check-in: 19e896543a user: andygoth tags: andygoth-annotation-enhancements | |
| 21:30 | Remove unnecessary variable initializations check-in: c203ba902c user: andygoth tags: andygoth-annotation-enhancements | |
| 21:24 | Convert annotate page to use checkboxes check-in: 8017bad639 user: andygoth tags: andygoth-annotation-enhancements | |
| 21:18 | Correct operation of filevers query parameter to annotate pages check-in: 4b721600e7 user: andygoth tags: andygoth-annotation-enhancements | |
| 21:07 | Consolidated annotation file and manifest lookup code. This changes the error handling for the annotation web page to report an error rather than redirect to home. It also enables omitting the checkin query parameter when used with a server running within a checkout. (Later, by drh:) Move this code onto a branch because of build errors on Ubunt... check-in: 41f35ca4ec user: andygoth tags: andygoth-annotation-enhancements | |
| 19:10 | Fix the value of the ANN_FILE_VERS flag so that it no longer overlaps with DIFF_SLOW_SBS. Omit the ANN_FILE_ANCEST flag which was always true. Update the annotator so that it follows check-ins in generation order according to the ancestor table. check-in: d9ef474a1a user: drh tags: trunk | |
| 18:37 | Selectively revert a few changes made by the previous check-in check-in: b83ea94eb2 user: andygoth tags: trunk | |
| 18:32 | Add the -r|--revision option to the annotate command. check-in: 5a6b194bc9 user: andygoth tags: trunk | |
|
2017-09-22
| ||
| 18:10 | Show all possible heading styles in Markdown reference. Expand table example to more closely resemble typical usage. check-in: 02403f0647 user: andygoth tags: trunk | |
|
2017-09-21
| ||
| 21:49 | Improve error message when rejecting unversioned filenames check-in: 493e3bade9 user: andygoth tags: trunk | |
| 20:45 | Update the built-in SQLite to the latest 3.21.0 alpha that includes the enhancements to the Windows VFS that help it better deal with read-only repository files. check-in: e97d4443d5 user: drh tags: trunk | |
| 00:56 | Correct /doc webpage in the case of a read-only database containing a vcache table lacking the desired vid check-in: b20f6cbaf4 user: andygoth tags: trunk | |
|
2017-09-20
| ||
| 20:15 | Correct typo in documentation check-in: aad384d5d1 user: andygoth tags: trunk | |
| 15:47 | Update the built-in SQLite to the latest 3.21.0 alpha. check-in: edba9d332b user: drh tags: trunk | |
| 14:56 | Update the change log to record recent enhancements. check-in: 54c08082fc user: drh tags: trunk | |
| 13:36 | Fix another harmless compiler warning. check-in: 49b6f89b4f user: drh tags: trunk | |
| 13:35 | Remove dead code to fix harmless compiler warnings. check-in: 4c666ccf92 user: drh tags: trunk | |
| 13:21 | Some simple documentation on the URL Alias setup page. check-in: a3b689b3cd user: drh tags: trunk | |
| 12:58 | Fix permission processing on "configuration pull alias". check-in: b2b4af1356 user: drh tags: trunk | |
| 12:42 | Remove still more legacy configuration sync logic. check-in: 9a68e6e1b0 user: drh tags: trunk | |
| 12:34 | Add support for doing a "configuration sync" of URL aliases. check-in: 3d36a37a73 user: drh tags: trunk | |
| 12:25 | More legacy configuration sync code removed. check-in: fe7f0ece30 user: drh tags: trunk | |
| 12:10 | Remove support for the legacy configuration sync transfer format, that was replaced in 2011. check-in: 2ed7c1123d user: drh tags: trunk | |
| 04:08 | Correct typo in title of web page check-in: a3e50c99f3 user: andygoth tags: trunk | |
| 04:05 | Correct comment typos check-in: b1191c1ee0 user: andygoth tags: trunk | |
| 03:27 | Add preliminary support for URL aliasing. Create aliases by visiting the "URL Aliases" subscreen under the Setup menu. check-in: 8131f1c5d9 user: drh tags: trunk | |
|
2017-09-19
| ||
| 20:09 | Add the ability to temporarily disable all ads. check-in: 48d8af20b7 user: drh tags: trunk | |
| 20:00 | On the /stat page, show only the compressed size of unversioned artifacts, and show the percentage of the total repository space taken up by unversioned files. check-in: 69d22d3bb1 user: drh tags: trunk | |
| 19:20 | Show the delta-source ID on files as well as check-ins for the "showid" query parameter on the /timeline page. check-in: 4f134e06ce user: drh tags: trunk | |
| 18:28 | Add missing table cell in bottom right corner of unversioned file list web page check-in: f39c33c133 user: andygoth tags: trunk | |
| 18:04 | Show file sizes in the description of individual file artifacts. check-in: 4c268999d5 user: drh tags: trunk | |
| 17:24 | New submenu links to the artifact list and 250-largest artifacts pages. check-in: 0594266c8e user: drh tags: trunk | |
| 04:05 | Fix a problem with file delta detection in extra_compression(). check-in: 4fd147f815 user: drh tags: trunk | |
| 03:57 | Fix problems in the new content_deltify() routine. check-in: cb29bc646b user: drh tags: trunk | |
| 01:48 | When the "showid" query parameter is given on /timeline or /finfo, show the delta-source artifact ID in addition to the artifact ID. check-in: 29935c6e3e user: drh tags: trunk | |
| 01:36 | Change the content_deltify() routine so that looks an array of candidate source artifacts and picks the one that gives the best delta. check-in: a4047a91e3 user: drh tags: trunk | |
|
2017-09-08
| ||
| 04:05 | Moved the check for iconv(3) in -liconv up within auto.def. If it happens after the checks for OpenSSL on certain macOS configurations, autosetup can be fooled into believing it doesn't need -liconv on that platform. This checkin splits up the group of cc-check-functions calls, so the moved call is now documented as to why its segregated. check-in: e6f64f5eeb user: wyoung tags: trunk | |
| 00:10 | Correct handling of mtime updates for UV push. check-in: 669cd4041b user: drh tags: trunk | |
|
2017-09-07
| ||
| 23:56 | Minor formatting changes in the UV sync logic. No logical changes to code. check-in: ac15e6d14a user: drh tags: trunk | |
| 05:04 | Improve the debug information available when using Login Groups. check-in: 7f4393dab4 user: andybradford tags: trunk | |
|
2017-08-31
| ||
| 18:32 | Improvements to the /fdiff webpage: Add the option of using from= and to= query parameters to get a diff between two files in the same check-in. check-in: 19497648d7 user: drh tags: trunk | |
| 05:51 | Correct typo in help's help check-in: 0d8c3c2bef user: andygoth tags: trunk | |
| 03:37 | Improved error message when the "help" command cannot find its argument. check-in: 2817800164 user: drh tags: trunk | |
| 02:00 | Merge trunk check-in: d15c1ba0f9 user: jan.nijtmans tags: multi-thread | |
| 01:00 | Enhance the mkindex utility to extract help text for each setting separately and automatically build the aSetting table. Various other enhancements that take advantage of this new capability. check-in: f74f7014c2 user: drh tags: trunk | |
|
2017-08-30
| ||
| 23:03 | Enhancements to the /setup_settings web page. Provide hyperlinks to documentation for all settings. Closed-Leaf check-in: 5068f23d3e user: drh tags: improved-setting-help | |
| 17:08 | Enhance the mkindex utility to extract help text for each setting separately and automatically build the aSetting table. check-in: 3d02004f6e user: drh tags: improved-setting-help | |
| 14:15 | Removed dead reference to g.fNoDirSymlinks. check-in: 949d777d76 user: stephan tags: trunk | |
| 13:29 | Merge cleanX Closed-Leaf check-in: fd47eae7da user: jan.nijtmans tags: cleanX-no-clean-glob | |
| 13:27 | Enable the admin-log and access-log by default for new repositories. check-in: 4a80c3c437 user: drh tags: trunk | |
| 13:17 | Don't prompt before removing empty directories check-in: 81d72e7257 user: jan.nijtmans tags: cleanX | |
| 13:12 | Add click-to-sort on columns of the admin-log display. check-in: 703b57cfd1 user: drh tags: trunk | |
| 13:07 | Merge cleanX check-in: 9297610047 user: jan.nijtmans tags: cleanX-no-clean-glob | |
| 13:02 | Merge trunk check-in: d4f98e25c1 user: jan.nijtmans tags: cleanX | |
| 12:02 | Remove the --no-dir-symlinks option. This is a back-out of check-in [2375d6cbce933267] together with other cleanup changes. check-in: b7272185ca user: drh tags: trunk | |
|
2017-02-17
| ||
| 13:23 | Cherrypick 810d29320b: Remove the CLANG_VERSION macro, since we have learned that version numbers in clang are "marketing" and are inconsistent and unreliable. Builds using clang will still use the GCC_VERSION macro since clang works hard to be gcc compatible. check-in: c453a91606 user: jan.nijtmans tags: branch-1.37 | |
|
2017-02-14
| ||
| 15:41 | (cherry-pick): Update the built-in SQLite to version 3.17.0 check-in: 17a33275f0 user: jan.nijtmans tags: branch-1.37 | |
|
2017-02-06
| ||
| 18:30 | Fail a "fossil commit" that contains a --branch option for an open branch unless there is also a --force option. check-in: b1026f20cc user: drh tags: trunk | |
|
2017-02-04
| ||
| 19:58 | Improve help text for the pull/push/sync commands. check-in: 04c6e7ee82 user: mistachkin tags: trunk | |
|
2017-02-03
| ||
| 15:13 | On diff/gdiff command, override "diff-binary" setting when argument "--diff-binary off" command line option is specified, not only with "--diff-binary on". check-in: f62c247083 user: mgagnon tags: trunk | |
|
2017-01-29
| ||
| 12:44 | (cherry-pick): Changing the password requires a 'real' login. check-in: fb4b87d95d user: jan.nijtmans tags: branch-1.37 | |
|
2017-01-28
| ||
| 19:48 | Changing the password requires a 'real' login. check-in: 8b562b90c0 user: mistachkin tags: trunk | |
|
2017-01-27
| ||
| 12:30 | (cherry-pick): Make "fossil version -v" work again with SQLite 3.15.x, since no-where is documented that "fossil now requires SQLite 3.16" Change VERSION to 1.37.1 (if ever released, this should at least be in it) check-in: e79e454446 user: jan.nijtmans tags: branch-1.37 | |
| 12:28 | (cherry-pick): The default MIME type for JSON wiki text should be 'text/x-fossil-wiki', not 'text/plain'. check-in: 80d5408de1 user: jan.nijtmans tags: branch-1.37 | |
| 12:27 | (cherry-pick): Update the "search" command to honor the -R option. check-in: eab6be7b02 user: jan.nijtmans tags: branch-1.37 | |
| 12:26 | (cherry-pick): Fix the --differ option on "fossil changes" which was broken in the 1.37 release. Openssl 1.0.2j -> 1.0.2k check-in: 86db914551 user: jan.nijtmans tags: branch-1.37 | |
| 12:21 | Make "fossil version -v" work again with SQLite 3.15.x, since no-where is documented that "fossil now requires SQLite 3.16" check-in: 042d6a7b98 user: jan.nijtmans tags: trunk | |
| 09:02 | Merge trunk. Openssl 1.1.0c -> 1.1.0d check-in: 767ae39cf4 user: jan.nijtmans tags: openssl-1.1 | |
| 08:57 | Openssl 1.0.2j -> 1.0.2k. Whitespace. check-in: 8cb5da6f27 user: jan.nijtmans tags: trunk | |
|
2017-01-25
| ||
| 01:00 | The default MIME type for JSON wiki text should be 'text/x-fossil-wiki', not 'text/plain'. check-in: 58dd538355 user: mistachkin tags: trunk | |
|
2017-01-19
| ||
| 13:46 | Update the "search" command to honor the -R option. check-in: 377fbf2ca7 user: drh tags: trunk | |
|
2017-01-18
| ||
| 12:40 | Fix the --differ option on "fossil changes" which was broken in the 1.37 release. check-in: 3eec799992 user: drh tags: trunk | |
| 11:19 | Upgrade to openssl 1.1.0c. Merge trunk (up to fossil 1.37 release) check-in: d0fbbd0115 user: jan.nijtmans tags: openssl-1.1 | |
|
2017-01-17
| ||
| 03:10 | Updates to the Win32 version resource. check-in: 8dc5d4fcd9 user: mistachkin tags: trunk | |
| 02:22 | Improved libfuse version information. check-in: 28c7a35f2e user: drh tags: trunk | |
| 02:16 | More revisions to verbose version information reporting, especially for FUSE. Closed-Leaf check-in: 444e3c4375 user: mistachkin tags: versionReform | |
|
2017-01-16
| ||
| 23:34 | Provide more information about compile-time options to the "fossil version -v" command. check-in: 3192b13d20 user: drh tags: trunk | |
| 23:16 | Update the www/mkdownload.tcl script so that it generates a download page appropriate for version 1.37. check-in: 66a6377ed2 user: drh tags: trunk | |
| 20:58 | Version 1.37 check-in: 1669115ab9 user: drh tags: trunk, release, version-1.37 | |
| 20:35 | The "fossil version -v" command and the /version?verbose webpage show the same output. Update the change log for the 1.37 release. check-in: 9c97d23d36 user: drh tags: trunk | |
| 09:05 | Update the built-in Zlib to the 1.2.11 release check-in: df91c2277f user: jan.nijtmans tags: trunk | |
|
2017-01-11
| ||
| 16:36 | Fix obsolete references to the legacy download page. Always refer to the new unversioned-content download page. check-in: a1d7539214 user: drh tags: trunk | |
|
2017-01-10
| ||
| 20:38 | Schema enhancements necessary to support the Remark artifact. Closed-Leaf check-in: f051f1d3d1 user: drh tags: remarks-on-checkins | |
| 20:32 | Improvements to comments and file format docs. check-in: f0c19ea170 user: mistachkin tags: remarks-on-checkins | |
| 19:09 | Merge changes from trunk. check-in: 43fa1ecc73 user: drh tags: remarks-on-checkins | |
| 19:08 | Expand the scope of the new Remark artifact so that it may be attached to either a check-in or a branch. check-in: b78d1a67b7 user: drh tags: remarks-on-checkins | |
| 13:05 | Fix the report logic so that @-bindings in the SQL work the same as $- and :-bindings. check-in: 241f1e2a4f user: drh tags: trunk | |
| 05:30 | Add the changes from check-in [3dddf7674b] to the 'makemake.tcl' tool, which is used to generate the Makefiles. check-in: 913058306f user: mistachkin tags: trunk | |
| 04:49 | Fix dirent.h related compile errors when building for WINXP platform. check-in: 3dddf7674b user: ashepilko tags: trunk | |
|
2017-01-09
| ||
| 23:37 | Since the db_database_slot() function is called during database error processing, it must use db_prepare_ignore_error() and then check the return code. check-in: 02fa325a59 user: mistachkin tags: trunk | |
|
2017-01-08
| ||
| 21:04 | A couple more typo fixes in the file format document. check-in: 290404ec37 user: mistachkin tags: remarks-on-checkins | |
| 02:03 | Small whitespace fix. check-in: 7353be6873 user: mistachkin tags: remarks-on-checkins | |
| 02:03 | Fix a typo in the file format document. check-in: 1c7438d478 user: mistachkin tags: remarks-on-checkins | |
|
2017-01-07
| ||
| 19:29 | Update the manifest parser so that it accepts remark artifacts. check-in: e40143aaff user: drh tags: remarks-on-checkins | |
| 19:10 | Describe the Remark artifact used to record check-in remarks. check-in: 0e9021f800 user: drh tags: remarks-on-checkins | |
| 18:54 | Clarification of the W card in the file-format document. check-in: 5e9e76733a user: drh tags: trunk | |
|
2017-01-06
| ||
| 17:01 | Update the built-in SQLite to version 3.16.2. check-in: ddfc7a608b user: drh tags: trunk | |
| 15:28 | Upgrade dirent.h to version 1.22. Minor spacing changes. check-in: b66b99cde9 user: jan.nijtmans tags: trunk | |
| 13:09 | The "fossil all ui" command still does not work for repos that do not end in ".fossil", but it at least does not hyperlink them any more. check-in: 805122df65 user: drh tags: trunk | |
| 04:09 | Fix user's email being swapped with name in git export committer record. check-in: 76d9a4555b user: ashepilko tags: trunk | |
|
2017-01-04
| ||
| 10:42 | Restore executable flags, accidently changed in previous commit check-in: 5972c3310f user: jan.nijtmans tags: trunk | |
| 10:40 | Add a web-page, where we can see the details on how SQLite was compiled (pragma compile_options), as sub-page for "stat". check-in: eac405d7d6 user: jan.nijtmans tags: trunk | |
| 09:34 | Update the built-in SQLite to the 3.16.1 release check-in: a8cd1e5427 user: jan.nijtmans tags: trunk | |
|
2017-01-03
| ||
| 22:39 | Simplify and cleanup various Fossil versioned setting files. check-in: 724b1536a8 user: mistachkin tags: trunk | |
| 10:53 | Update the built-in Zlib to the 1.2.10 release. check-in: ad8ad49de3 user: jan.nijtmans tags: trunk | |
|
2017-01-02
| ||
| 19:11 | Update the built-in SQLite to the 3.16.0 release. check-in: 8b12786a1e user: drh tags: trunk | |
|
2017-01-01
| ||
| 18:50 | Upgrade zlib to version 1.2.9 check-in: e38d5e1cbd user: jan.nijtmans tags: trunk | |
|
2016-12-31
| ||
| 17:07 | Fix a broken hyperlink on the homepage. check-in: 0dc84fa224 user: drh tags: trunk | |
|
2016-12-30
| ||
| 18:26 | Update the built-in SQLite with minor fixes discovered during release testing. check-in: 506dff5f7c user: drh tags: trunk | |
| 00:15 | Update the built-in SQLite to the 3.16.0 beta for testing. check-in: 53430370a5 user: drh tags: trunk | |
|
2016-12-28
| ||
| 18:20 | Update test case now that merge rename bug has been fixed with checkin [0df5249d51]. check-in: b09be7ba2f user: andybradford tags: trunk | |
|
2016-12-26
| ||
| 14:00 | Update the built-in SQLite to fix a potential (unreleased) corruption bug. check-in: 88d581dc5e user: drh tags: trunk | |
|
2016-12-24
| ||
| 21:58 | Fix a harmless compiler warning. check-in: 1eb509a807 user: drh tags: trunk | |
| 21:55 | Improved documentation of the "fossil sql" command. Add a note to the change log discussing recent enhancements to the "fossil sql" command. check-in: a52f196740 user: drh tags: trunk | |
| 19:38 | Update the built-in SQLite to include the change that makes "main" an acceptable alias for the primary database, even if the primary database has been renamed to "repository" or "localdb". check-in: 0d28198d03 user: drh tags: trunk | |
| 18:19 | Update the shell.c file from upstream (SQLite) so that the ".databases" command works with arbitrary-length filenames. check-in: 277774b49e user: drh tags: trunk | |
| 18:07 | Improve the "fossil sql" command so that it opens all database - repository, localdb, and configdb. Use the latest command-line shell code from the SQLite project so that the ".tables" command correctly shows all tables. check-in: 070815585a user: drh tags: trunk | |
| 00:30 | When a file has been deleted on the current branch and edited on a separate branch, bring in the edited version of the file when merging from the separate branch. check-in: 0df5249d51 user: drh tags: trunk | |