Index: f-apps/f-test-merge.c ================================================================== --- f-apps/f-test-merge.c +++ f-apps/f-test-merge.c @@ -811,10 +811,13 @@ } MARKER(("Contents of " FSL__TABLE_PIVOT ":\n")); fsl_db_each(db, fsl_stmt_each_f_dump, NULL, "SELECT * FROM " FSL__TABLE_PIVOT " ORDER BY src DESC, rid, pending, src"); + MARKER(("Contents of [vmerge]:\n")); + fsl_db_each(db, fsl_stmt_each_f_dump, NULL, + "SELECT * FROM vmerge order by merge"); } MARKER(("fsl_ckout_merge() does not yet do anything useful.\n")); MARKER(("Still TODO are the approx. 300 lines of fossil(1)'s merge " "starting at:\n" "https://fossil-scm.org/home/file/src/merge.c?ci=e340af58a249dc09&ln=769-776\n" Index: f-apps/index.md ================================================================== --- f-apps/index.md +++ f-apps/index.md @@ -1,16 +1,19 @@ # The f-apps -The source tree contains a few test/demo apps which are named +The source tree contains a number of test/demo apps which are named `f-something` (the "f" is for "fossil", of course). Collectively, these apps demonstrate the functionality which is currently ported in from fossil(1) (or is new) and working. If a fossil(1) feature is not represented here, it's probably not yet ported. Note that libfossil is still very much in development, so -any or all of these may be... fussy... at times. Also note that these +any or all of these may be... *fussy*... at times. Also note that these are primarily for testing and demonstrating the library, and may not -be suitable as apps for every-day use. +be suitable as apps for every-day use. *That said*, the active libfossil +developers tend to use these applications as "daily drivers" for their +fossil work, where appropriate. e.g. `f-ci` is used for performing most +checkins into this repository. In alphabetical order: * [`f-_template.c`](/finfo?name=f-apps/f-_template.c) is a documented template from which new fcli-using apps can be quickly created.