Overview
| Comment: | merge: stack merges as fossil does; the base is fossil's pivot over the pending merges and the commit records every merged parent |
|---|---|
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA3-256: |
be53dcc13b9ff132210494726caa4d5d |
| User & Date: | dmestas on 2026-10-23 01:24:56.068 |
| Other Links: | manifest | tags |
Context
|
2026-10-23
| ||
| 02:31 | import-git stores tracked files that parse as Fossil artifacts sterilized, as fossil commit does, and export-git strips the marker; --use-author records the Git author; pack takes -R on a bare store check-in: 2dd81018af user: dmestas tags: trunk | |
| 01:24 | merge: stack merges as fossil does; the base is fossil's pivot over the pending merges and the commit records every merged parent check-in: be53dcc13b user: dmestas tags: trunk | |
| 00:39 | shun: work on a bare store with -R, and --porcelain reports one action per hash check-in: d46238a0df user: dmestas tags: trunk | |
Changes
Modified src/checkout.zig
from [bd111fbe9c]
to [c266e3037d].
[diff]
Modified src/cmd/checkout.zig
from [0e81ab468f]
to [593fa21478].
[diff]
Modified src/cmd/tracking.zig
from [7424a54193]
to [2929d07967].
[diff]
Modified src/e2e.zig
from [481e0367a1]
to [23805900e9].
[diff]
Modified src/main.zig
from [21f78ce7f3]
to [bfcc02a9a3].
[diff]
Modified src/repository.zig
from [b4f8e004a9]
to [5a6894daa9].
[diff]
Modified src/repostate.zig
from [2a4876ec66]
to [7712a31e88].
[diff]
Modified src/repostate_test.zig
from [3db2b7dec5]
to [8fbbd80b16].
[diff]
Modified src/smoke.zig
from [3d87bc93ee]
to [28df8fb99a].
[diff]
Modified src/undo.zig
from [fadd68923b]
to [3a0d0420d2].
[diff]
Modified www/reference.html
from [90c9664dd2]
to [7489ccd18c].
[diff]