diff --git a/CHANGES.md b/CHANGES.md index b9257c0..508f049 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -59,7 +59,7 @@ concern - readable here, never shipped as something to parse. --- -## 8.0.0-beta.46 - 2026-10-06 - publish/sync merge generated files mechanically and carry non-overlapping uncommitted work through a rebase +## 8.0.0-beta.47 - 2026-10-06 - sync record: the autostash note states the behaviour, not the change **Author:** Torben Nehmer @@ -157,8 +157,15 @@ concern - readable here, never shipped as something to parse. - wiki-ingest and wiki-manage call xref add with --rel, not the --rel-a/--rel-b removed in 4.0.0 - raw accept: an occupied folder name held by a captured bundle points at --replaces-bundle - kb/CONVENTIONS.md.template: the guideline filter is a default, not a setup question +- sync record: the autostash note states the behaviour, not the change +### sync record: the autostash note states the behaviour, not the change + +One note in `sync`'s command record, written with 8.0.0-beta.46, said that uncommitted changes no +incoming commit touches "no longer" stop a rebase - a sentence about the change, which a reader of +the record has nothing to compare against. It now states what `sync` does (Gitea #180). + ### publish/sync merge generated files mechanically and carry non-overlapping uncommitted work through a rebase Every ingest touches `kb/index.md` and `kb/log.md`, so two ingests on two checkouts - or two diff --git a/VERSION b/VERSION index 0ae4a30..21429a9 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -8.0.0-beta.46 +8.0.0-beta.47 diff --git a/tools/CONTRACT.md b/tools/CONTRACT.md index 7ac8140..250342c 100644 --- a/tools/CONTRACT.md +++ b/tools/CONTRACT.md @@ -1922,7 +1922,7 @@ Fetch `/` and bring the local branch up to date with it. - Fetches `/`, then: fast-forwards when only the remote moved; rebases the local commits on top when both sides moved but touched disjoint files; exits 42 (rebase-review gate) when both sides touched the same file. - Files `wikitool` generates (`kb/index.md`, `kb/log.md`, `kb/provenance.md`, every `kb/**/INDEX.md`) never count as an overlap and never reach the gate. Where they are what stops git - uncommitted ones in the way of a fast-forward or rebase, or a rebase conflict in them - they are merged mechanically: `kb/log.md` becomes the incoming log plus the entries only this side appended, and the catalog and `kb/provenance.md` are regenerated from the merged pages and left as an uncommitted change. A reconcile git can do on its own is unchanged and regenerates nothing. -- Uncommitted changes that no incoming commit touches no longer stop a rebase: they are carried through it (`git rebase --autostash`) and come back unchanged. +- Uncommitted changes that no incoming commit touches do not stop a rebase: they are carried through it (`git rebase --autostash`) and come back unchanged. - Before anything is set aside, the working tree is stored as a commit under `refs/wikitool/reconcile-backup`. A successful reconcile drops it; a failed one restores the working tree and names the ref. - A refused call performs no rebase attempt and leaves the branch where it was. - The `--confirm-rebase` token covers the exact upstream state and the set of files touched on both sides, generated files excluded; either one moving makes it stale. diff --git a/tools/chemenu/commands/git_publish.py b/tools/chemenu/commands/git_publish.py index 47b72b5..6d0904f 100644 --- a/tools/chemenu/commands/git_publish.py +++ b/tools/chemenu/commands/git_publish.py @@ -1349,7 +1349,7 @@ def apply_reconcile(outcome: ReconcileOutcome, remote: str, branch: str, command "plus the entries only this side appended, and the catalog and `kb/provenance.md` are " "regenerated from the merged pages and left as an uncommitted change. A reconcile git " "can do on its own is unchanged and regenerates nothing.", - "Uncommitted changes that no incoming commit touches no longer stop a rebase: they are " + "Uncommitted changes that no incoming commit touches do not stop a rebase: they are " "carried through it (`git rebase --autostash`) and come back unchanged.", "Before anything is set aside, the working tree is stored as a commit under " "`refs/wikitool/reconcile-backup`. A successful reconcile drops it; a failed one "