Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
21 check-ins related to "port-merge"
|
2021-12-13
| ||
| 03:52 | Merge in port-merge branch for further merge development - keeping this in a separate branch is unnecessary and is getting annoying. There's still plenty of work to do on the merge port. check-in: 63fe74d7f3 user: stephan tags: trunk | |
|
2021-12-08
| ||
| 07:04 | Cherrypicked inadvertent checkin to the wrong branch via /fileedit. check-in: 6dddf8537b user: stephan tags: trunk | |
| 07:02 | Minor doc touchups Closed-Leaf check-in: e9c9fccc7f user: stephan tags: port-merge | |
| 06:55 | Merged in trunk. Kinda funny that f-ci can check in a merge but we don't yet have f-merge to actually create a merge. check-in: 49e14934d8 user: stephan tags: port-merge | |
|
2021-12-06
| ||
| 03:42 | Ported in line numbers in merge conflict markers from [fossil:14f44e933c0c0c2c | fossil checkin 14f44e933c0c0c2c]. check-in: 3e58eea1f3 user: stephan tags: trunk | |
|
2021-11-23
| ||
| 17:10 | Merged in trunk. One of these days i'll get around to finishing this major TODO. One of these days. check-in: fef2c50c9d user: stephan tags: port-merge | |
| 16:22 | Added --no-ignore-glob/-i flag to f-ciwoco and check input names against ignore-glob if that flag is not provided. check-in: c4783e49fc user: stephan tags: trunk | |
|
2021-11-16
| ||
| 03:36 | Merged in trunk. check-in: 604fe76cfe user: stephan tags: port-merge | |
|
2021-11-13
| ||
| 04:13 | Fixed HTML decoding (%T appendf specifier) range problem reported at [https://fossil-scm.org/forum/forumpost/cb564acd01] and fix adjacent string-length bugs. check-in: 70f66a328d user: stephan tags: trunk | |
|
2021-10-19
| ||
| 09:18 | merge in trunk for latest bits. check-in: df8635e89d user: stephan tags: port-merge | |
| 09:05 | Added the FSL_GLOB() SQL UDF and infrastructure to support it, to enable operations which make use of the configurable glob lists to access those via SQL. check-in: 496acd50a1 user: stephan tags: trunk | |
|
2021-10-18
| ||
| 10:18 | Added some debug output to f-test-merge.c. Discovered a f-revert bug in the process (it does not deal with pending vmerge state). check-in: 199e2cbcad user: stephan tags: port-merge | |
| 10:09 | Merged in port-merge branch for many non-merge-specific tweaks made there. Merge feature is still in development. check-in: 4672dd694e user: stephan tags: trunk | |
| 10:02 | Random doc updates and moved an enum from fossil-util.h to fossil-db.h. check-in: f069532a71 user: stephan tags: port-merge | |
|
2021-10-17
| ||
| 10:39 | More slow progress on the merge port. check-in: 2c0ca8f720 user: stephan tags: port-merge | |
| 10:38 | Added variants of fsl_cx_exec() (fsl_db_exec() proxy) and changed error propagation semantics of fsl_cx_prepare() to be more useful. check-in: 9abdf965ac user: stephan tags: port-merge | |
|
2021-10-16
| ||
| 19:01 | This checkin was actually caused by a "CLI misinteraction," but that gives us an excellent opportunity to move it to its own branch for use with merge testing. Closed-Leaf check-in: 3faa7222a6 user: stephan tags: mistake | |
| 18:48 | f-test-merge: fixed an incorrect if/else branch of porting which included a path we don't want (automatic selection of a fork to merge in). Fixed a NULL dereference when --help was invoked. Added some debug output. check-in: ae59f86383 user: stephan tags: port-merge | |
| 16:24 | Minor code reorgs and reminders to self for the continued merge porting later on. check-in: 81e6402728 user: stephan tags: port-merge | |
| 15:50 | Another few hundred lines of merge infrastructure and lots of unrelated constness tweaks. Moving to a branch because we can't test some of the new features without one. check-in: 3ff20f1d01 user: stephan tags: port-merge | |
| 13:28 | More work on porting over merge infrastructure. check-in: bc66e6a73a user: stephan tags: trunk | |