Login
Changes On Branch port-merge
Login
Patch Side-by-Side Diff

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Changes In Branch port-merge Excluding Merge-Ins

This is equivalent to a diff from 3e58eea1f3 to e9c9fccc7f

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
02:33
Minor help text and API doc cleanups. One minor allocation optimization in fsl_repo_rebuild(). check-in: 17a7f5cf12 user: stephan tags: trunk

Changes to f-apps/f-test-merge.c.
︙
809
810
811
812
813
814
815



816
817
818
819
820
821
822

809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825








+
+
+








                  "SELECT * FROM " FSL__TABLE_FVM
                  " ORDER BY fn, fnp, fnm");
    }
    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"
          "Much of that is similar to the update process, but how much "
          "can be consolidated is still unclear.\n"));
︙
Changes to f-apps/index.md. 
1
2
3

4
5
6
7
8
9

10
11




12
13
14
15
16
17
18

1
2

3
4
5
6
7
8

9
10

11
12
13
14
15
16
17
18
19
20
21



-
+





-
+

-
+
+
+
+








# 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.
      It performs all of the bootstrapping necessary to get an app up and
      running with very little effort.
︙