Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
96 check-ins using file src/merge3.c version f72871c5bf
|
2016-12-08
| ||
| 06:17 | Update to SQLite 3.15.2 ... (Closed-Leaf check-in: 8b03934ead user: jan.nijtmans tags: branch-1.36) | |
|
2016-11-05
| ||
| 04:30 | Fix extra empty lines in diff output from non-interactive process on Windows; similar to [f2fc37c0]. ... (check-in: 476fe9e932 user: ashepilko tags: trunk) | |
|
2016-11-04
| ||
| 23:16 | Update to SQLite 3.15.1 ... (check-in: a8a67989fc user: jan.nijtmans tags: branch-1.36) | |
| 23:13 | Fix various typos in makeheaders.html. Use curly quotes instead of classic `` and '' quotes (ref: [http://www.dwheeler.com/essays/quotes-in-html.html]). Format most such quoted text in monospace print. ... (check-in: 9b960af129 user: andygoth tags: andygoth-timeline-ms) | |
| 22:12 | Fix crash introduced by merge of andygoth-quote-apostrophe ... (check-in: 10b98c1e61 user: andygoth tags: andygoth-timeline-ms) | |
| 21:55 | Merge trunk ... (check-in: 250c12c2f7 user: andygoth tags: andygoth-timeline-ms) | |
| 21:53 | Use count(x) instead of sizeof(x)/sizeof(*x) ... (check-in: cda8c14c16 user: andygoth tags: andygoth-timeline-ms) | |
| 21:39 | Use timeline_submenu() instead of style_submenu_element() ... (check-in: c1a77615ca user: andygoth tags: trunk) | |
| 21:32 | Remove unused, undocumented zTitle argument to style_submenu_element(). This argument appears to have been unused all the way back to [dbda8d6ce9]. ... (check-in: 187424e891 user: andygoth tags: trunk) | |
| 21:12 | Improve quoting of match tags and patterns. Ignore empty match tags and patterns. ... (check-in: 98cc8782e1 user: andygoth tags: andygoth-timeline-ms) | |
| 20:49 | Integrate andygoth-quote-apostrophe. Needed because single quotes can be used in the tag filter entry, and these single quotes would otherwise be passed through unprotected to the output HTML. ... (check-in: 68bd2e7bed user: andygoth tags: andygoth-timeline-ms) | |
| 17:35 | int/size_t pedantry ... (check-in: 30d96141cd user: andygoth tags: trunk) | |
| 17:28 | Further magic _WIN32_WINNT changes to fix the build for mingw. ... (check-in: 45b7634436 user: drh tags: trunk) | |
| 17:25 | Modify linenoise.c so that it can build with -std=c89. Baseline linenoise.c relied on snprintf(), strdup(), and strcasecmp() which are technically not in C89. Since linenoise.c's only purpose (at present) is to implement the SQLite shell, make use of the SQLite compatibility functions. Following this change, "fossil clean -f && CFLAGS='-std=c89 -Wall' ./configure && make" builds without warnings or errors on gcc 4.4.7 20120313 (Red Hat 4.4.7-3) on CentOS release 6.4 (Final). Unrelated note: discovered during testing that "CFLAGS=-Werror ./configure" fails to add -lm to link step due to conflicting types for built-in function "sin" being regarded as an error. ... (check-in: 8133501ecb user: andygoth tags: trunk) | |
| 16:21 | Add timeline web UI to set tag filter and match style. Still not 100%. (1) Now that more than one text entry is on the page, pressing enter does not trigger a submit [Firefox ESR 10.0.12], (2) electing "Related" causes Tag Filter to blank, (3) entering a tag filter while "Related" is selected causes "Related" to be deselected, (4) possibly too much clutter, and (5) definitely too much clutter if combined with any future expansions. (1) is due to the lack of a submit button. (2) and (3) are a bad interaction between the t=/r= dichotomy and the design of style_submenu_entry(). (4) maybe could be addressed by changing "Related"/"Branch Only" and "Without Files"/"With Files" to checkbuttons, but style_submenu_checkbox() was never actually implemented. (Probably also want "Unhide" to be a checkbox.) For (5) I have in mind letting the admin define a project-specific list of preset filters. ... (check-in: d4a6d3c1ec user: andygoth tags: andygoth-timeline-ms) | |
| 15:52 | Change style_submenu_entry() to allow zero and negative iSize. Zero iSize means display size and length limit are not specified, and negative iSize means no length limit is specified but the display size is set to the absolute value of iSize. ... (check-in: 2e9ac33a9a user: andygoth tags: andygoth-timeline-ms) | |
| 15:48 | Move GLOB before LIKE in list of possible match styles ... (check-in: fc25a1270e user: andygoth tags: andygoth-timeline-ms) | |
| 15:12 | Revert unintended change that snuck in alongside prior merge ... (check-in: f0b91665ab user: andygoth tags: andygoth-timeline-ms) | |
| 15:09 | Merge trunk ... (check-in: 490daed204 user: andygoth tags: andygoth-timeline-ms) | |
| 12:03 | typo ... (check-in: e826eadd9c user: jan.nijtmans tags: trunk) | |
|
2016-11-03
| ||
| 18:31 | Compilation fix for MinGW: consistently use _WIN32_WINNT when including winsock2.h, etc. ... (check-in: 26a88f1bbf user: mistachkin tags: trunk) | |
| 09:52 | Cherrypick 3 bug-fixes from SQLite trunk, discovered just after the SQLite 3.15 release, among them a fix to VACUUM to prevent it from running out of memory on very large databases See [http://www.sqlite.org/src/info/34a579141b2c5ac|34a579141b2c5ac] and [http://www.sqlite.org/src/info/fef4bb4bd9185ec8f|fef4bb4bd9185ec8f] (most likely, those 3 will be in SQLite 3.15.1, if ever released) ... (check-in: 360694a797 user: jan.nijtmans tags: branch-1.36) | |
| 09:33 | (cherry-pick): Fix the build on MSVC. ... (check-in: 83a359ff39 user: jan.nijtmans tags: branch-1.36) | |
|
2016-11-02
| ||
| 19:12 | Merge updates from trunk. ... (check-in: 25285f06f2 user: mistachkin tags: openssl-1.1) | |
| 17:47 | Fix the build on Windows. ... (check-in: 11e105b3c9 user: drh tags: trunk) | |
| 15:16 | Update the built-in SQLite to the latest trunk version that includes a fix to VACUUM to prevent it from running out of memory on very large databases. ... (check-in: 7fa9701b3d user: drh tags: trunk) | |
| 10:22 | Collapse two memset's into one. Typo in mkdownload.tcl ... (check-in: 5f88968404 user: jan.nijtmans tags: trunk) | |
| 10:16 | Eliminate unnecessary end-of-line spacing in wiki. No textual changes. ... (check-in: f47b7052c6 user: jan.nijtmans tags: trunk) | |
| 06:41 | Fix compilation issue on Unix due to 'mkindex' wrongly attempting to include 'cmd_win32_service' due to its #if processing. ... (check-in: 69f64a8d64 user: mistachkin tags: trunk) | |
|
2016-11-01
| ||
| 23:34 | Enhancements to SEE integration on Windows. ... (check-in: 7aeeb30286 user: mistachkin tags: trunk) | |
|
2016-10-31
| ||
| 18:57 | Backout the fusefs change. The correct solution is to run "./configure" followed by "make clean fossil" in order to rebuild when updating from historical sources. ... (check-in: 08f0ac0cb4 user: drh tags: trunk) | |
| 16:03 | Merge the accidental fork. ... (check-in: d13fc6a6b7 user: drh tags: trunk) | |
| 16:02 | Fix to the fusefs.c file so that it builds even without FOSSIL_HAVE_FUSEFS. ... (check-in: 9a4a5dec3d user: drh tags: trunk) | |
| 13:36 | Fix harmless "Local declaration of 'rc' hides declaration of the same name in outer scope", reported by Kevin (arnoldemu) on fossil-users list. ... (check-in: 0c3ae89dcb user: jan.nijtmans tags: trunk) | |
| 12:41 | Fix harmless memory leaks. ... (check-in: 36babe0ce1 user: drh tags: trunk) | |
| 10:55 | Omit deleted unversioned files from the /uvlist page unless the showdel=1 query parameter is used. ... (check-in: a3608700ad user: drh tags: trunk) | |
|
2016-10-29
| ||
| 16:50 | Compiler warning (MSVC) in timeline.c, found by Kevin, reported on fossil-users list ... (check-in: fe3d30fc60 user: jan.nijtmans tags: trunk) | |
|
2016-10-28
| ||
| 22:51 | merge fork. ... (check-in: cf2adc71e8 user: mgagnon tags: trunk) | |
| 22:45 | Fix a C99-ism introduced by check-in [27c8985cc1b75cf5]. ... (check-in: 2bb3a8e10d user: mistachkin tags: trunk) | |
| 22:45 | Fix a C99-ism. ... (check-in: 61ec712492 user: mgagnon tags: trunk) | |
| 05:29 | Alternative to check-in [a4bb89ba08], make FuseFS act just like the JSON feature in 'auto.def'. ... (check-in: feb202f5dc user: mistachkin tags: trunk) | |
| 04:27 | Alternative to check-in [a4bb89ba08], make FuseFS act just like the JSON feature in 'auto.def'. ... (Closed-Leaf check-in: 6a80a2f246 user: mistachkin tags: altFuseFsDef) | |
|
2016-10-27
| ||
| 15:35 | Combine multiple merge lines to the bottomn of the page when they reference the same source check-in. ... (check-in: 95d6ddc3a0 user: drh tags: trunk) | |
| 15:34 | Add another entry to the graph-test-1.wiki checklist for this case. ... (Closed-Leaf check-in: 58d4f3c076 user: drh tags: baruch-timeline-fix) | |
| 14:57 | Merge lines descending to the bottom of the timeline that refer to the same commit ... (check-in: 8ae790623c user: baruch tags: baruch-timeline-fix) | |
| 05:28 | Now that FuseFS support is conditional, permit config.h to be included so FOSSIL_HAVE_FUSEFS can be correctly included from autoconfig.h to avoid linker failure to find fusefs_cmd. ... (check-in: a4bb89ba08 user: andybradford tags: trunk) | |
|
2016-10-26
| ||
| 23:33 | Make the labels on the color submenu of the /brlist page more succinct. ... (check-in: a1b0ec8e39 user: drh tags: trunk) | |
| 21:45 | Create a temporary index to speed up incremental Git import. ... (check-in: 0fa60142eb user: mistachkin tags: trunk) | |
| 21:32 | Minor tweaks to the break_into_lines() algorithm. Add tests. ... (check-in: 057e4b0a62 user: mistachkin tags: trunk) | |
| 21:31 | Minor security enhancements to the optional SEE integration. ... (check-in: a8484dc327 user: mistachkin tags: trunk) | |
| 21:28 | Fixes for incremental Git import/export. ... (check-in: 27c8985cc1 user: mistachkin tags: trunk) | |
| 21:26 | Add the 'project_description' variable to TH1. ... (check-in: cd219d31c1 user: mistachkin tags: trunk) | |
| 21:24 | Add the 'unversioned' command to TH1, with the 'content' and 'list' sub-commands. ... (check-in: 1b5b69f3cf user: mistachkin tags: trunk) | |
| 21:21 | Enhance 'brlist' page to make use of branch colors. ... (check-in: 796c9abacd user: mistachkin tags: trunk) | |
| 21:14 | Update change log. ... (check-in: 94f7de8b2d user: mistachkin tags: trunk) | |
| 21:08 | Remove the 'fusefs' command from builds that do not have underlying support enabled. ... (check-in: 75ef451128 user: mistachkin tags: trunk) | |
| 20:54 | Draft fix for issue with 'ticket set +icomment' reported by Venkat Iyer on the mailing list. ... (check-in: 0b646cea7c user: mistachkin tags: trunk) | |
| 19:58 | Update fedora version, being used for Docker image. Minor fix in changelog ... (check-in: f014e83bc4 user: jan.nijtmans tags: trunk) | |
| 02:07 | Merge trunk ... (check-in: b5edfa3b3c user: andygoth tags: andygoth-timeline-ms) | |
|
2016-10-25
| ||
| 22:06 | Merge updates from trunk. ... (Closed-Leaf check-in: 66c5bc56ae user: mistachkin tags: experimental) | |
| 22:05 | Remove the 'fusefs' command from builds that do not have underlying support enabled. ... (check-in: 20b67ab3b0 user: mistachkin tags: experimental) | |
| 20:25 | Add the --command option to "fossil diff". ... (check-in: eb67f09c9a user: drh tags: trunk) | |
| 20:12 | Fix the download hyperlink on the homepage. ... (check-in: be88817fad user: drh tags: trunk) | |
| 01:21 | Fix the mkdownload.tcl script so that it generates a correctly-formatted download.html page. ... (check-in: 1d028af6c7 user: drh tags: trunk) | |
|
2016-10-24
| ||
| 21:54 | Merge updates from trunk. ... (check-in: 1375911c53 user: mistachkin tags: experimental) | |
| 21:53 | Remove BOM (byte-order-mark) from the change log. ... (check-in: a2f4710221 user: mistachkin tags: trunk) | |
| 20:00 | Typo in the change log. ... (check-in: 7f2af9d8eb user: drh tags: trunk) | |
| 18:37 | Correct change description. Intermingling declarations and code was added in C99, not C89. ... (check-in: 291ca60f54 user: andygoth tags: trunk) | |
| 18:33 | Revert unintended, incomplete change to timeline.c ... (check-in: 5cb36bdd52 user: andygoth tags: andygoth-timeline-ms) | |
| 18:32 | Merge changes.wiki style update ... (check-in: 780c0150c2 user: andygoth tags: andygoth-timeline-ms) | |
| 18:20 | Update the version number to 1.37 and start the 1.37 change log. ... (check-in: a212bd1899 user: drh tags: trunk) | |
| 18:15 | Fix the build on MSVC. ... (check-in: 65e69b8dd8 user: drh tags: trunk) | |
| 17:57 | Further improvements to the mkdownload.tcl script. ... (check-in: 529941901a user: drh tags: trunk) | |
| 17:03 | Add fragment anchors in the changes.wiki page. Update the mkdownload.tcl script so that it works with the new unversioned-file download. ... (check-in: d0c77c7ce0 user: drh tags: trunk) | |
| 15:52 | Add comments describing each local variable in tagMatchExpression() ... (check-in: 1219bffce0 user: andygoth tags: andygoth-timeline-ms) | |
| 15:47 | Inconsequential whitespace changes ... (check-in: 9ffc501710 user: andygoth tags: andygoth-timeline-ms) | |
| 15:44 | Push to 1.37 ... (check-in: 4d1bee54ee user: andygoth tags: andygoth-timeline-ms) | |
| 14:59 | Version 1.36 ... (check-in: c24373934d user: drh tags: trunk, release, version-1.36) | |
| 14:58 | Set the 1.36 release dates on the change log. ... (check-in: fdebeba5a0 user: drh tags: trunk) | |
| 04:51 | Draft fix for issue with 'ticket set +icomment' reported by Venkat Iyer on the mailing list. ... (Closed-Leaf check-in: 0d247d57b4 user: mistachkin tags: tktSetFix) | |
|
2016-10-23
| ||
| 21:50 | Optimize REGEXP matching by folding all regular expressions into one ... (check-in: b4800dc53d user: andygoth tags: andygoth-timeline-ms) | |
| 15:42 | Improve comment ... (check-in: c1afe56ffa user: andygoth tags: andygoth-timeline-ms) | |
| 15:36 | Add ms=EXACT|LIKE|GLOB|REGEXP timeline query parameter which changes the interpretation of the t= and r= query parameters to exact (default), SQL LIKE, glob, or regular expression matching. Other than exact matching, the t= or r= parameter value is interpreted as a whitespace- or comma-delimited list of match patterns, with the option to quote a pattern using single or double quotes in case it contains commas or whitespace. For regular expression matching only, backslash can also be used to inhibit delimiter interpretation of the next character. At this point, the only way to use this feature is to type ms= directly into the URL; the UI still needs to be updated. Be aware for LIKE interpretation that % needs to be written as %25. ... (check-in: be58684514 user: andygoth tags: andygoth-timeline-ms) | |
| 02:16 | Fixes for incremental Git import/export. ... (check-in: 9599705c69 user: mistachkin tags: experimental) | |
| 02:14 | Minor tweaks to the break_into_lines() algorithm. Add tests. ... (check-in: d3cc6d1d09 user: mistachkin tags: experimental) | |
| 02:07 | Minor security enhancements to the optional SEE integration. ... (check-in: 69352027bb user: mistachkin tags: experimental) | |
| 01:46 | Add the 'project_description' variable to TH1. ... (check-in: 345c580d0a user: mistachkin tags: experimental) | |
| 01:45 | Add the 'unversioned' command to TH1, with the 'content' and 'list' sub-commands. ... (check-in: a5fd16fe88 user: mistachkin tags: experimental) | |
| 01:42 | Enhance 'brlist' page to make use of branch colors. ... (check-in: 435ca5d2e4 user: mistachkin tags: experimental) | |
| 01:28 | Minor enhancement to 'mkversion'. ... (check-in: f59f4e1f6e user: mistachkin tags: trunk) | |
|
2016-10-22
| ||
| 19:52 | Begin the transaction block before inserting any content. Addresses one of the bugs reported by Venkat Iyer on ML. ... (check-in: 1b6635a47f user: andybradford tags: trunk) | |
| 08:37 | Fix typo on a wiki page. ... (check-in: f65fe580e7 user: mistachkin tags: trunk) | |
| 08:26 | Add the 'test-prompt-user' command. ... (check-in: 8817b0ed6e user: mistachkin tags: trunk) | |
|
2016-10-20
| ||
| 17:04 | Add text for the '--ssl-identity' global option to the 'Environment Variables and Global Options' page. ... (check-in: 7c7597220a user: mistachkin tags: trunk) | |
| 16:53 | Revert unintended change to stash usage summary ... (check-in: 63ac71e571 user: andygoth tags: trunk) | |
| 16:48 | Remove extra newlines from calls to fossil_fatal() ... (check-in: 2c42b217e5 user: andygoth tags: trunk) | |