fossil

• Jan 23, 2023 fossil merging

  Merging binary files in Fossil - to do or not to do?

  This is a note about merging (or not merging) binary files in Fossil.

  Scenario

  Two users Marilyn and Jim update to latest and begin working on their versions of the repository. Marilyn, changes a binary file called DEMO and commits her changes. Meanwhile, Jim changes his DEMO and tries to commit his changes. When he does so, he is warned that a fork would result from his commit.

  Current Situation

  flowchart LR START[ ]-->id1((2))-->id2((3)) id1((2))-..->STOP[ ] style START fill-opacity:0, stroke-opacity:0 style STOP fill-opacity:0, stroke-opacity:0

  In this note, I look at different solutions to the problems arising when two different committers try to commit changes to the same binary file. This is just a note, not a published solution set. It presents my current thinking on the matter and will inevitably evolve as my understanding of Fossil grows.

• Jan 7, 2023 operating-systems truenas-core fossil

  Installing and running Fossil on TrueNAS Core

  This note is about installing and running Fossil SCM on TrueNAS Core.

  Fossil is brought to us by the same people who developed SQLite. It was created to serve their needs, but is useful to everybody with a similar set of needs (pretty much any dev team). According to the fossil folks over at https://fossil-scm.org, "Fossil is a simple, high-reliability, distributed software configuration management system..." To mme, it's my git-killer.

  I have been running Fossil for about a year to see if it was worth replacing git for my own use. After this year, while I still like git and I will continue to use it for disposable repos, I have completely jumped ship for my own repos and won't be going back to hosting them on anything else anytime soon. Fossil is very lightweight, fast and responsive, has a fantastic server side ui, and is slightly more intuitive to use. It is also easier to recover from when things go wonky.