diff --git a/CHANGES.md b/CHANGES.md index b02f273..178ce28 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -59,7 +59,7 @@ concern - readable here, never shipped as something to parse. --- -## 8.0.0-beta.48 - 2026-10-06 - publish --path nimmt ungespeicherte generierte Dateien außerhalb des Pfads mit +## 8.0.0-beta.49 - 2026-10-06 - raw accept --replaces-bundle: Erfolgsmeldung und Record nennen die A-Liste neben git diff **Author:** Torben Nehmer @@ -159,8 +159,18 @@ concern - readable here, never shipped as something to parse. - 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 +- raw accept --replaces-bundle: Erfolgsmeldung und Record nennen die A-Liste neben git diff +### raw accept --replaces-bundle: Erfolgsmeldung und Record nennen die A-Liste neben git diff + +`raw accept --replaces-bundle` closed with "`git diff` on the bundle shows the edition's +changes", and its command record said the same. Files the new edition added are still untracked +at that point, so `git diff` never shows them - a session that read only the diff missed every +new file. The success line and the record now say that `git diff` shows the `M` and `D` files +and that the `A` files are only in the list the accept prints, matching what `raw/CONTRACT.md` +and `wiki-ingest` already said. Drop-in: wording only, no behaviour changes (Gitea #181). + ### publish --path nimmt ungespeicherte generierte Dateien außerhalb des Pfads mit `publish --path ` staged and committed only ``. When the catalog and log it had written - diff --git a/VERSION b/VERSION index 2798d14..bc0ae3b 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -8.0.0-beta.48 +8.0.0-beta.49 diff --git a/tools/CONTRACT.md b/tools/CONTRACT.md index f51d3a8..986e58b 100644 --- a/tools/CONTRACT.md +++ b/tools/CONTRACT.md @@ -1693,7 +1693,7 @@ Promote one or more files, or one folder, from `incoming/` into `raw/`. - A file already at its computed destination is what "already exists" reports, not a partial prior run to resume - safe to retry as-is once a cause is fixed. - A folder carrying `_capture.json` at its top is a captured bundle (`raw capture`): `--fidelity`/`--authority` come from that manifest only and are refused on the command line; the folder must hold exactly the files the manifest lists. `_capture.json` goes in no `raw_files:`. - `--replaces-bundle ` replaces a captured bundle under `raw/` with the new edition in `incoming/` at the same address: files gone from the new edition are removed, emptied directories `rmdir`ed, and afterwards the bundle holds exactly the new manifest's files plus `_capture.json`. `raw_files:` is left untouched; an owning source page's `fidelity`/`authority` is overwritten where the new manifest differs. -- `--replaces-bundle` prints each changed file as `A`/`M`/`D`, grouped by owning source page with its citing pages, and the `touch --page ... --add/--remove raw_files=` lines that follow; `git diff` on the bundle shows the edition's changes. +- `--replaces-bundle` prints each changed file as `A`/`M`/`D`, grouped by owning source page with its citing pages, and the `touch --page ... --add/--remove raw_files=` lines that follow; `git diff` on the bundle shows the `M` and `D` files, the `A` files appear only in that list because they are still untracked. - `--replaces` and `--page` refuse a target inside a captured bundle; the refusal names `raw capture --update` and `--replaces-bundle`. A file named `_capture.json` anywhere but at a captured folder's top is refused - the name is reserved. - `--dry-run` reports the moves without making them. diff --git a/tools/chemenu/commands/raw_cmd.py b/tools/chemenu/commands/raw_cmd.py index ea4be25..a761230 100644 --- a/tools/chemenu/commands/raw_cmd.py +++ b/tools/chemenu/commands/raw_cmd.py @@ -958,7 +958,8 @@ def _replace_bundle( for line in next_lines: typer.echo(line) success("Review the pages above in this same run: the replacement and their update belong in one " - "commit. `git diff` on the bundle shows the edition's changes.") + "commit. `git diff` on the bundle shows the `M` and `D` files; the `A` files are only in " + "the list above - they are still untracked.") @cli_contract.record(cli_contract.CommandRecord( @@ -1051,7 +1052,8 @@ def _replace_bundle( "page's `fidelity`/`authority` is overwritten where the new manifest differs.", "`--replaces-bundle` prints each changed file as `A`/`M`/`D`, grouped by owning source page " "with its citing pages, and the `touch --page ... --add/--remove raw_files=` lines that " - "follow; `git diff` on the bundle shows the edition's changes.", + "follow; `git diff` on the bundle shows the `M` and `D` files, the `A` files appear only in " + "that list because they are still untracked.", "`--replaces` and `--page` refuse a target inside a captured bundle; the refusal names " "`raw capture --update` and `--replaces-bundle`. A file named `_capture.json` anywhere but " "at a captured folder's top is refused - the name is reserved.",