Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
94 check-ins using file test/merge5.test version 085bd67162
|
2016-02-06
| ||
| 02:27 | Improve the MSVC build tool sub-routine 'fn_UnsetVariable'. check-in: 4c163cd715 user: mistachkin tags: trunk | |
|
2016-02-05
| ||
| 23:46 | On Windows, normalize the Fossil executable file extension used by the test suite. check-in: 74ce4181d9 user: mistachkin tags: trunk | |
|
2016-02-04
| ||
| 16:06 | Fix a minor preprocessor directive typo. Closed-Leaf check-in: 4fae98e73f user: jan tags: jan-manifest-tags | |
| 15:22 | Merge from trunk. check-in: ea7f329704 user: jan tags: jan-manifest-tags | |
|
2016-02-02
| ||
| 15:58 | updated to miniz-1.16 beta r1 Closed-Leaf check-in: 0cd368f1bf user: stephan tags: miniz-1.16br1 | |
| 04:18 | Simpler alternative to [7063f8d4cc]. Skips initial directory portion of PATH_INFO when building the g.zBaseURL and g.zTop used with a directory of repositories. check-in: 7d5307b44f user: mistachkin tags: altBaseUrlRepoDir | |
| 03:39 | Candidate fix for --baseurl option when used with a directory of repositories. May need fine-tuning. Closed-Leaf check-in: 7063f8d4cc user: mistachkin tags: baseUrlRepoDir | |
|
2016-02-01
| ||
| 20:38 | Add --https and --nossl options to the 'server' command. check-in: b8c7af5bd9 user: mistachkin tags: trunk | |
| 20:36 | The 'g.zHttpsURL' variable should be populated even when the --baseurl option is used. check-in: 4110f52297 user: mistachkin tags: trunk | |
| 20:35 | Having the 'setup' or 'admin' permission should imply having the 'delete' and 'private' permissions as well (i.e. since they can change their own permissions anyhow). check-in: b241130222 user: mistachkin tags: trunk | |
| 20:35 | Add the 'insertCsrf' and 'verifyCsrf' commands to TH1. check-in: f8820eff4e user: mistachkin tags: trunk | |
| 20:22 | Use strncmp() instead of memcmp(). Closed-Leaf check-in: ffd5e09ec7 user: mistachkin tags: httpsBaseUrl | |
| 04:38 | Test of latest feature branches, do not merge. Closed-Leaf check-in: 1a164e5fb7 user: mistachkin tags: do-not-merge, feature-test | |
| 04:34 | Add --https and --nossl options to the 'server' command. Closed-Leaf check-in: 2bf596c9d5 user: mistachkin tags: serverHttps | |
| 04:11 | Comment fix. check-in: c3a17f81cf user: mistachkin tags: httpsBaseUrl | |
| 04:11 | The 'g.zHttpsURL' variable should be populated even when the --baseurl option is used. check-in: c45195f123 user: mistachkin tags: httpsBaseUrl | |
| 03:56 | Having the 'setup' or 'admin' permission should imply having the 'delete' and 'private' permissions as well (i.e. since they can change their own permissions anyhow). Closed-Leaf check-in: 62f8ac1f69 user: mistachkin tags: adminPerms | |
|
2016-01-31
| ||
| 21:13 | Add the 'insertCsrf' and 'verifyCsrf' commands to TH1. Closed-Leaf check-in: 0357c16930 user: mistachkin tags: th1AntiCsrf | |
| 21:03 | Minor corrections to comments for login_verify_csrf_secret(). check-in: 3c47e0c66a user: mistachkin tags: trunk | |
| 00:51 | Make sure to add the zlib library to LIBS even when configure is run without any arguments. check-in: eb0cf27ab7 user: mistachkin tags: trunk | |
|
2016-01-30
| ||
| 21:53 | Add 'redirect' to the TH1 command summary as well. check-in: d653a1a854 user: mistachkin tags: trunk | |
| 21:40 | Add the 'redirect' command to TH1. check-in: 71caba53bd user: mistachkin tags: trunk | |
| 04:29 | Improve auto-detection of Tcl on systems where -lpthread is missing from TCL_LIB_SPEC. check-in: 352e2ef9c6 user: mistachkin tags: trunk | |
| 01:28 | Make configure more robust when using the in-tree zlib and OpenSSL. check-in: b41f42841f user: mistachkin tags: trunk | |
|
2016-01-29
| ||
| 22:57 | Tweak for 'internal-sqlite=0'. Closed-Leaf check-in: 98881d8970 user: mistachkin tags: configInTree | |
| 22:36 | Make configure more robust when using the in-tree zlib and OpenSSL. check-in: 0e34218465 user: mistachkin tags: configInTree | |
| 21:06 | Require the 'read' permission to view the 'test-version' web page. check-in: 83b2acb704 user: mistachkin tags: trunk | |
| 21:03 | Add test-version web page. Refactor command line 'version' command code into a function to help facilitate that. check-in: f7cd247b95 user: mistachkin tags: trunk | |
| 07:00 | fixed type of JsonPageDef::runMode from char to int because it uses negative values and char is unsigned by ARM platforms. check-in: 8f6b78e7b2 user: stephan tags: trunk | |
|
2016-01-28
| ||
| 22:15 | remove submenu items from branch list page that link to old-style list, since all the individual inforation is now available in aggregated and sortable form on the main list Closed-Leaf check-in: 972dc1c632 user: baruch tags: test-only, do-not-merge | |
| 21:32 | Add test-version web page. Refactor command line 'version' command into a function to help facilitate that. Closed-Leaf check-in: eb7a7a3321 user: mistachkin tags: testVersionPage | |
| 20:54 | Merge updates from trunk. Fix compiler warnings. check-in: cfd3a5b944 user: mistachkin tags: baruch_timeline_fixes | |
| 20:51 | Test of feature branches, do not merge. check-in: b0f2a0ac53 user: mistachkin tags: test-only, do-not-merge | |
| 20:39 | Improve MinGW build docs. check-in: c1c680eb28 user: mistachkin tags: trunk | |
| 20:18 | Correct some TH1 command syntax comments. check-in: 2948c3fe22 user: mistachkin tags: trunk | |
| 19:48 | Update referenced OpenSSL version. check-in: 0c860dd9e7 user: mistachkin tags: trunk | |
| 05:37 | Minor style and comment cleanup. Add verify_all_options() to several TH1 test commands. Add 'test-th-source' test command, with test. check-in: f141fbeac5 user: mistachkin tags: trunk | |
| 00:08 | Make the MSVC batch build tool sub-routine 'fn_UnsetVariable' a bit more robust. check-in: 8e9cdd242c user: mistachkin tags: trunk | |
|
2016-01-27
| ||
| 01:55 | Revise test result summary to include 'ignored' results from tests marked with 'knownBug'. check-in: f77fbed8e3 user: mistachkin tags: trunk | |
| 01:44 | Add 'knownBug' constraints to the two failing merge tests along with the necessary test suite changes. check-in: 60285f5876 user: mistachkin tags: trunk | |
| 01:28 | Merged from trunk to pick up test case edits made there, along with recent cosmetic fixes. check-in: 4e0e141e0d user: rberteig tags: rberteig-json-test | |
| 01:23 | Added copyright and license comment blocks to two existing test case files that were missing them, with years based on looking for when the tests were first added to the repository. check-in: 08a3587814 user: rberteig tags: trunk | |
| 00:44 | Update copyright date to this year since the JSON tests are new this year. Fix indentation of Tcl to match established convention. Add test of JSON API version to reflect earliest I expect to pass these tests. Document block of Version and HAI, and add version for consistency. check-in: c4f8d88fd9 user: Ross tags: rberteig-json-test | |
|
2016-01-26
| ||
| 15:42 | Improved error message when the "ls" command is used with -R but without -r. check-in: 844a7a786f user: drh tags: trunk | |
| 14:12 | Redo TIP #440 alternative - again - now using the "info runtime" command. Closed-Leaf check-in: 9633f6ac94 user: jan.nijtmans tags: tip-440-alt | |
| 13:18 | Fix a comment with wrong parameters description check-in: 12cf825f66 user: baruch tags: trunk | |
| 10:22 | Alternative TIP #440 implementation, based on TIP #59 check-in: 2ba6587cc5 user: jan.nijtmans tags: tip-440-alt | |
| 09:18 | Make fusefs a 2nd-tier command if it is not supported by the build check-in: 50d81f9504 user: baruch tags: pending-review | |
| 02:45 | Minor spacing fix. check-in: 2ff6ceb985 user: mistachkin tags: rberteig-json-test | |
| 01:46 | Place a cornerstone for scaffolding of the test cases for the fossil json command and related REST API. This begins with an extension to fossil_maybe_answer in tester.tcl that adds a -expectError option to flag invocations of fossil that are expected to exit with error status and not log it when -quiet is in effect. The new file json.test has the f... check-in: 95080f47e2 user: Ross tags: rberteig-json-test | |
| 01:36 | Create new branch named "rberteig-json-test" check-in: 5089155821 user: Ross tags: rberteig-json-test | |
|
2016-01-24
| ||
| 14:43 | Add option to show real branch colors in branch list check-in: 26fc65f99c user: baruch tags: pending-review | |
| 10:13 | Fix Older/Newer buttons if showing exactly up to the first/last event check-in: 0e782b3d7c user: baruch tags: ready-for-review, baruch_timeline_fixes | |
|
2016-01-21
| ||
| 21:40 | Fix Older/Newer buttons if showing timeline before beginning or after end of existing timeline check-in: aa867868d8 user: baruch tags: baruch_timeline_fixes | |
| 12:44 | fixed condition which caused the "Yearly total" row to not be rendered on the oldest year in the bymonth report in some cases. check-in: ec3dd27f97 user: stephan tags: trunk | |
| 10:32 | Fix memory leak from previous commit Closed-Leaf check-in: 9ab7122d6a user: baruch tags: pending-review | |
|
2016-01-20
| ||
| 23:07 | Fix "Newer" button in timeline when using "c" parameter check-in: 28dd7c1daa user: baruch tags: pending-review | |
| 22:41 | Of course, the value of "::tcl::pkgconfig get engine" should be "TH1" check-in: fd00816d95 user: jan.nijtmans tags: tip-440-alt | |
| 22:33 | How about the TIP #59 way of TIP #440? "::tcl::pkgconfig get engine" -> "core" check-in: fbc9e292ec user: jan.nijtmans tags: tip-440-alt | |
| 18:31 | Use a VIEW rather than a TABLE for collecting the data for some piecharts. check-in: 2bd670ac3c user: drh tags: trunk | |
| 14:42 | Upgrade the build-in SQLite to a new 3.11.0 alpha that fixes the LIKE operator bug found in 3.10.0. check-in: 0d757274d3 user: drh tags: trunk | |
| 13:36 | Add submenu to default branch list page Closed-Leaf check-in: 737e8d2394 user: baruch tags: pending-review | |
| 13:04 | (experiment) Implement "package require Tcl" according to the alternative TIP #440 implementation. check-in: 6bb2308fcb user: jan.nijtmans tags: tip-440-alt | |
| 12:15 | Remove even fusefs command from non fuse-enabled builds check-in: 06fd798bdc user: baruch tags: pending-review | |
| 10:46 | Change piechart table to view since tables have undefined order Closed-Leaf check-in: cdf0d6a3a3 user: baruch tags: pending-review | |
|
2016-01-19
| ||
| 18:59 | Remove superfluous library reference when compiling with MinGW. check-in: 9a09124875 user: mistachkin tags: trunk | |
| 18:48 | Get configure and make, via autosetup, working on MinGW. check-in: a0061bb2ed user: mistachkin tags: trunk | |
| 01:37 | Update the built-in SQLite to a newer version that fixes C89-isms in FTS5. check-in: 0d120a6102 user: drh tags: trunk | |
|
2016-01-18
| ||
| 23:46 | Fix to the test-content-erase command so that it correctly undeltafies. check-in: d0cabcb617 user: drh tags: trunk | |
| 23:25 | Run PRAGMA integrity_check on the database at the end of the "test-integrity" command. check-in: 00bfa66e6c user: drh tags: trunk | |
| 23:19 | Improved "help" for the "fossil whatis" command. check-in: 0f9d0f0ba1 user: drh tags: trunk | |
| 23:13 | Add the test-erase-content command. check-in: e709bf16e7 user: drh tags: trunk | |
| 22:34 | Improved error message when a received artifact has an incorrect hash. check-in: 4c8e6d91d2 user: drh tags: trunk | |
| 17:48 | Improve some comments. check-in: dda5d11d98 user: mistachkin tags: trunk | |
| 17:41 | Add the 'array exists' and 'array names' sub-commands to TH1. Add tcl_platform(engine) and tcl_platform(platform) to TH1. check-in: ea7813da56 user: mistachkin tags: trunk | |
| 03:11 | Update change log. Closed-Leaf check-in: 853a228591 user: mistachkin tags: mingwConfigure | |
| 03:07 | Fix the test-content-undelta command. check-in: 786017890d user: drh tags: trunk | |
| 03:05 | Update change log. Closed-Leaf check-in: 042dac535a user: mistachkin tags: tclPlatform | |
| 02:22 | Fix comment. check-in: 1a3f326b3a user: mistachkin tags: tclPlatform | |
| 02:21 | Add the 'array exists' and 'array names' sub-commands to TH1. check-in: fd4ada4a11 user: mistachkin tags: tclPlatform | |
| 01:43 | Merge trunk. check-in: 58466e7f60 user: mistachkin tags: tclPlatform | |
| 01:42 | Update TH1 docs. check-in: 2427250b01 user: mistachkin tags: trunk | |
| 01:42 | Update TH1 docs. check-in: d4bdaeab30 user: mistachkin tags: tclPlatform | |
|
2016-01-17
| ||
| 23:00 | Minor naming tweak. check-in: 07324777f2 user: mistachkin tags: tclPlatform | |
| 22:17 | Add support for the tcl_platform(platform) and tcl_platform(engine) array elements to TH1. check-in: 663b722e27 user: mistachkin tags: tclPlatform | |
| 22:12 | Better runtime settings detection by the 'th1' test file. check-in: d8d2222b91 user: mistachkin tags: trunk | |
|
2016-01-16
| ||
| 23:10 | More zlib detection before OpenSSL detection. Closed-Leaf check-in: fd2842c08a user: mistachkin tags: zlibBeforeOpenSsl | |
| 22:51 | Further refinements to permit OpenSSL in tree to work consistently. check-in: 08918fabc7 user: mistachkin tags: mingwConfigure | |
| 22:25 | Fix use of linenoise. Fine-tune check for in-tree OpenSSL. check-in: 54307c4d7d user: mistachkin tags: mingwConfigure | |
| 21:36 | Sync up the 'makemake.tcl' tool. check-in: 2c7eee4c9a user: mistachkin tags: mingwConfigure | |
| 21:26 | More fine-tuning. check-in: c76ea6b4ec user: mistachkin tags: mingwConfigure | |
| 21:20 | Fix cut and paste error in zlib option description. check-in: 2c24954c34 user: mistachkin tags: mingwConfigure | |
| 21:18 | Get vanilla configure and make, via autosetup, working on Win32. check-in: 75a0abacac user: mistachkin tags: mingwConfigure | |
|
2016-01-14
| ||
| 22:33 | In the 'merge5' test, use the configured Fossil executable instead of relying on the PATH. check-in: acbee54e8b user: mistachkin tags: trunk | |