ilyagr.bsky.social
just playing with tangled
mkdocs fixups
+6
-6
+1
-1
docs/sapling-comparison.md
+1
-1
docs/sapling-comparison.md
···
3
3
## Introduction
4
4
5
5
This document attempts to describe how jj is different
6
-
from [Sapling](sapling-scm.com). Sapling is a VCS developed by Meta. It is a
6
+
from [Sapling](https://sapling-scm.com). Sapling is a VCS developed by Meta. It is a
7
7
heavily modified fork of [Mercurial](https://www.mercurial-scm.org/). Because
8
8
jj has copied many ideas from Mercurial, there are many similarities between the
9
9
two tools, such as:
+3
-3
docs/technical/architecture.md
+3
-3
docs/technical/architecture.md
···
76
76
77
77
### Backend
78
78
79
-
The [`Backend`](../../lib/src/backend.rs) trait defines the interface each
79
+
The `Backend` trait defines the interface each
80
80
commit backend needs to implement. The current in-tree commit backends
81
-
are [`GitBackend`](../../lib/src/git_backend.rs)
82
-
and [`LocalBackend`](../../lib/src/local_backend.rs).
81
+
are `GitBackend`
82
+
and `LocalBackend`.
83
83
84
84
Since there are non-commit backends, the `Backend` trait should probably be
85
85
renamed to `CommitBackend`.
+2
-2
docs/technical/concurrency.md
+2
-2
docs/technical/concurrency.md
···
60
60
contains a pointer to the view object (like how commit objects point to tree
61
61
objects), pointers to parent operation(s) (like how commit objects point to
62
62
parent commit(s)), and metadata about the operation. These types are defined
63
-
[here](../../lib/protos/op_store.proto). The operation log is normally linear.
63
+
in `op_store.proto` The operation log is normally linear.
64
64
It becomes non-linear if there are concurrent operations.
65
65
66
66
When a command starts, it loads the repo at the latest operation. Because the
···
90
90
are recorded in the resulting view object. For example, if branch `main` was
91
91
moved from commit A to commit B in one operation and moved to commit C in a
92
92
concurrent operation, then `main` will be recorded as "moved from A to B or C".
93
-
See the `RefTarget` [definition](../../lib/protos/op_store.proto).
93
+
See the `RefTarget` definition in `op_store.proto`.
94
94
95
95
Because we allow branches (etc.) to be in a conflicted state rather than just
96
96
erroring out when there are multiple heads, the user can continue to use the