Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | Add information on the Git-to-Fossil converter and a comparison article on Fossil and Git. |
|---|---|
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA1: |
ae0628aa99a835f01fa06d5b4a41ecc2 |
| User & Date: | drh 2010-11-11 18:21:55.000 |
Context
|
2010-11-11
| ||
| 20:01 | typo check-in: 71f7103494 user: bch tags: trunk | |
| 18:21 | Add information on the Git-to-Fossil converter and a comparison article on Fossil and Git. check-in: ae0628aa99 user: drh tags: trunk | |
| 13:36 | Fix the "fossil import" command so that it correctly handles cases where a file is deleted then replaced by a directory with the same name. check-in: e5a734a19a user: drh tags: trunk | |
Changes
Added www/fossil-v-git.wiki.
> > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 |
<title>Fossil Versus Git</title>
<h2>1.0 Don't Stress!</h2>
If you start out using one DVCS and later decide you like the other better,
is is [./inout.wiki | easy to change].
But it also helps to be informed about the difference between
[http://git-scm.com | Git] and Fossil. See the table below for
a high-level summary and the text that follows for more details.
Keep in mind that you are reading this on a Fossil website,
so the information here
might be biased in favor of Fossil. Ask around with people who have
used both Fossil and Git for other opinions.
<h2>2.0 Executive Summary:</h2>
<blockquote><center><table border=1 cellpadding=5>
<tr><th width="50%">GIT</th><th width="50%">FOSSIL</th></tr>
<tr><td>File versioning only</td>
<td>Versioning, Tickets, Wiki, and Blog/News</td></tr>
<tr><td>Sharding</td><td>Replicating</td></tr>
<tr><td>Huge community</td><td>Road less traveled</td></tr>
<tr><td>Complex</td><td>Intuitive</td></tr>
<tr><td>Separate web tools</td><td>Integrated Web interface</td></tr>
<tr><td>Lots of little tools</td><td>Single executable</td></tr>
<tr><td>Pile-of-files repository</td><td>Single file repository</td></tr>
<tr><td>Uses "<tt>rebase</tt>"</td><td>Immutable</td></tr>
<tr><td>GPL</td><td>BSD</td></tr>
</table></center></blockquote>
<h2>3.0 Discussion</h2>
<h3>3.1 Feature Set</h3>
Git provides file versioning services only, whereas Fossil adds an
integrated [./wikitheory.wiki | wiki],
[./bugtheory.wiki | ticketing & bug tracking],
[./embedddeddoc.wiki | embedded documentation], and
[./event.wiki | News/Blog features].
These additional capabilities are available for Git as 3rd-party
user-installed add-ons, but with Fossil they are integrated into
the design. One way to describe Fossil is that it is
"[https://github.com/ | github]-in-a-box".
<h3>3.2 Sharing Model</h3>
Git supports a sharded source tree, whereas Fossil wants all all
syncing repositories to carry all information. Git allows individual
developers to maintain multiple branches on their local repository
and then selectively push only one or two branches to higher level
developers. Fossil also allows private local branches, but Fossil
tends to encourage sharing everything, not just one or two select
branches. The Git model works best for large projects, like the
Linux kernel, since Linus doesn't really want to see a thousand
different branches, one for each contributor. Git allows intermediary
"gate-keepers" to merge changes from multiple lower-level developers
into a single branch and only present Linus with a handful of branches
at a time. Fossil encourages a tight-knit, smaller, and more closely
cooperating developer community where all participants share all
of their code all of the time.
The prototypical Git development model is that each developer maintains
their own branch and the various changes from each developer are later
merged into a master branch by an integrator. The prototypical Fossil
development model is that multiple developers collaborate on the same
branch at the same time.
So in other words, Git promotes a model where individual developers
keep a subset of the branches of a project (sharding) whereas Fossil
promotes every developer having a complete copy of all branches
(replicating).
<h3>3.3 Community</h3>
Git has a huge user community. If it following the herd and being
like everybody else is important to you, then you should choose Git.
Fossil is clearly the "road less traveled":
<blockquote>
Two roads diverged in a wood, and I —<br>
I took the one less traveled by,<br>
And that has made all the difference.<br>
<small>- Robert Frost, <i>The Road Not Taken</i>, 1916</small>
</blockquote>
</i></blockquote>
Among the advantages of Git's huge user community are that new team
members may already be familiar with Git's operation and hence can
bypass the VCS learning curve. Also, if you need an add-on tool or
script of some kind, a Google search will likely turn up a suitable
tool that you can just download and use. A huge community also means
that somebody else has likely already encountered and fixed the bugs
so that for you the product will work as advertised.
Among the advantages of the "road less traveled" is that your particular
project will be bigger percentage of the total user base, and is thus
more likely to receive attention from the DVCS maintainers if you do
encounter problems.
<h3>3.4 Complexity</h3>
Git is a complex system. It can be tricky to use and requires a fair
amount of knowledge and experience to master. Fossil strives to be
a much simpler system that can be learned and master much more quickly.
Fossil strives to have fewer "gotchas" and quirks that can trip up a
developer.
The ideal VCS should just get out of the way of the developer and allow
the developer to focus 100% of their thinking to the project under
development. One should not have to stop and think about how to operate
the VCS. Of course, no VCS is ideal. Every VCS requires the developer
to think about version control to some extent. But one wants to minimize
the thinking about version control.
Git requires the developer to maintain a more complex mental model than
most other DVCSes. Git takes longer to learn. And you have to spend
more time thinking about what you are doing with Git.
Fossil strives for simplicity. Fossil wants to be easy to learn and to
require little thinking about how to operating it. Reports from the
field indicate that Fossil is mostly successful at this effort.
<h3>3.5 Implementation Strategy</h3>
Git consists of a collection of many little programs. Git needs to be
"installed" using some kind of installer or package tool. Git can be
tricky to install and get working, especially for users without
administrative privileges.
Fossil is a single self-contained executable. To "install" Fossil one
has merely to download a precompiled binary and place that binary
somewhere on $PATH. To uninstall Fossil, simply delete the binary.
To upgrade Fossil, replace the old binary with a new one.
Fossil is designed to be trivial to install, uninstall, and upgrade so
that developers can spend more time working on their own projects and
much less time configuring their version control system.
<h3>3.6 Repository Storage</h3>
A Git repository is a "pile-of-files" in the ".git" directory at the
root of the working checkout. There is a one-to-one correspondence
between repositories and working checkouts. A power-loss or system crash
in the middle of Git operation can damage or corrupt the Git repository.
A Fossil repository consists of a single disk file. A single Fossil
repository can serve multiple simultaneous working checkouts.
A Fossil repository is an SQLite database, so it highly resistant
to damage from a power-loss or system crash - incomplete transactions
are simply rolled back after the system reboots.
<h3>3.7 Audit Trail</h3>
Git features the "rebase" command which can be used to change the
sequence of check-ins in the repository. Rebase can be used to "clean up"
a complex sequence of check-ins to make their intent easier for others
to understand. From another point of view, rebase can be used to
"rewrite history" - to do what
[http://en.wikipedia.org/wiki/Winston_Smith | Winston Smith] did for
a living in Orwell's novel
[http://en.wikipedia.org/wiki/Nineteen_Eighty-Four | 1984].
Fossil deliberately avoids rewriting history. Fossil strives to follow
the accounting philosophy of never erasing anything. Mistakes are fixed
by entering a correction, with an explanation of why the correction is
needed. This can make the history of a project messy, but it also
makes it more honest. The lack of a "rebase" function is considered
a feature of Fossil, not a bug.
<h3>3.8 License</h3>
Both Git and Fossil are open-source. Git is under
[http://www.gnu.org/licenses/gpl.html | GPL] whereas Fossil is
under the
[http://en.wikipedia.org/wiki/BSD_licenses | two-clause BSD license].
The difference should not be of a concern to most users. However,
some corporate lawyers have objections to using GPL products and
are more comfortable with a BSD-style license.
|
Changes to www/index.wiki.
| ︙ | ︙ | |||
129 130 131 132 133 134 135 136 137 138 139 140 141 142 |
* Documentation on the
[http://www.sqliteconcepts.org/THManual.pdf | TH1 Script Language] used
to configure the ticketing subsystem.
* A free hosting server for Fossil repositories is available at
[http://chiselapp.com/].
* How to [./server.wiki | set up a server] for your repository.
* Customizing the [./custom_ticket.wiki | ticket system].
<h3>Links For Fossil Developer:</h3>
* [./theory1.wiki | Thoughts On The Design Of Fossil].
* [./pop.wiki | Principles Of Operation]
* The [./fileformat.wiki | file format] used by every content
file stored in the repository.
| > > | 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 |
* Documentation on the
[http://www.sqliteconcepts.org/THManual.pdf | TH1 Script Language] used
to configure the ticketing subsystem.
* A free hosting server for Fossil repositories is available at
[http://chiselapp.com/].
* How to [./server.wiki | set up a server] for your repository.
* Customizing the [./custom_ticket.wiki | ticket system].
* [./inout.wiki | Import and export] from and to Git.
* [./fossil-v-git.wiki | Fossil versus Git].
<h3>Links For Fossil Developer:</h3>
* [./theory1.wiki | Thoughts On The Design Of Fossil].
* [./pop.wiki | Principles Of Operation]
* The [./fileformat.wiki | file format] used by every content
file stored in the repository.
|
| ︙ | ︙ |
Added www/inout.wiki.
> > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 | <title>Import And Export</title> Fossil has the ability to import and export repositories from and to [http://git-scm.com/ | Git]. And since most other version control systems will also import/export from Git, that means that you can import/export a Fossil repository to most version control systems using Git as an intermediary. <h2>Git → Fossil</h2> To import a Git repository into Fossil, run commands like this: <blockquote><pre> cd git-repo git fast-export --all | fossil import new-repo.fossil </pre></blockquote> In other words, simply pipe the output of the "git fast-export" command into the "fossil import" command. The 2nd argument to the "fossil import" command is the name of a new Fossil repository that is created to hold the Git content. <h2>Fossil → Git</h2> To convert a Fossil repository into a Git repository, run commands like this: <blockquote><pre> git init new-repo cd new-repo fossil export -R ../repo.fossil | git fast-import </pre></blockquote> In other words, create a new Git repository, then pipe the output from the "fossil export" commandn into the "git fast-import" command. Note that the "fossil export" command only exports the versioned files. Tickets and wiki and events are not exported, since Git does not understand those concepts. |
Changes to www/quickstart.wiki.
| ︙ | ︙ | |||
80 81 82 83 84 85 86 87 88 89 90 91 92 93 |
which in the example above is named "myclone.fossil".
You can name your repositories anything you want. The ".fossil" suffix
is not required.</p>
<p>Note: If you are behind a restrictive firewall, you might need
to <a href="#proxy">specify an HTTP proxy</a> to use.</p>
</blockquote><h2>Checking Out A Local Tree</h2><blockquote>
<p>To work on a project in fossil, you need to check out a local
copy of the source tree. Create the directory you want to be
the root of your tree and cd into that directory. Then
do this:</p>
| > > > > > > > | 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 |
which in the example above is named "myclone.fossil".
You can name your repositories anything you want. The ".fossil" suffix
is not required.</p>
<p>Note: If you are behind a restrictive firewall, you might need
to <a href="#proxy">specify an HTTP proxy</a> to use.</p>
</blockquote><h2>Importing From Another Version Control System</h2><blockquote>
<p>Rather than start a new project, or clone an existing Fossil project,
you might prefer to
<a href="./inout.wiki">import an existing Git project</a>
into Fossil.
</blockquote><h2>Checking Out A Local Tree</h2><blockquote>
<p>To work on a project in fossil, you need to check out a local
copy of the source tree. Create the directory you want to be
the root of your tree and cd into that directory. Then
do this:</p>
|
| ︙ | ︙ |