Skip to content

Revert: audit-fix merge (#11) — premature; code stays on dominik/audit-fixes-2026-05-28#12

Merged
settylab-dotto-bot[bot] merged 1 commit into
mainfrom
dominik/revert-audit-fixes-merge
May 29, 2026
Merged

Revert: audit-fix merge (#11) — premature; code stays on dominik/audit-fixes-2026-05-28#12
settylab-dotto-bot[bot] merged 1 commit into
mainfrom
dominik/revert-audit-fixes-merge

Conversation

@settylab-dotto-bot

Copy link
Copy Markdown
Contributor

What this does

Reverts dd40808 — the merge of PR #11 (align Mahalanobis and DA PTP with manuscript; bump 0.8.0) — restoring main to its pre-merge state at 62e83b6.

Why

The #11 merge was mis-targeted. The intent was to validate and merge revision PRs in a separate manuscript repository, not to land audit fixes on the public kompot code repo at this time. This revert backs the changes out of main cleanly.

No code is lost. The full audit-fix changeset — B-001, B-002, M-003, N-001, plus the v0.8.0 version bump and tests/test_audit_fixes.py — is preserved on the restored branch dominik/audit-fixes-2026-05-28 (tip 096fa2a5b) for continued use and a properly-targeted future merge.

Reverted-merge gotcha (read before re-merging)

This is a revert of a merge commit. Git now records the audit-fix changes as "already present and then removed" along first-parent history. If dominik/audit-fixes-2026-05-28 is later re-merged into main as-is, git will treat those changes as already-applied and silently drop them — the re-merge will appear to do nothing.

To re-land the audit fixes after this revert:

  1. First revert this revert commit (git revert <this-commit>), then merge the branch; or
  2. Rebase / cherry-pick the audit-fix commits onto current main so they arrive as fresh changes rather than through the already-reverted merge.

This is the standard "reverting a merge, then re-merging" caveat (see git's revert documentation / Linus's "How to revert a faulty merge" note).

Scope

  • Reverts only dd40808; nothing landed after it, so the revert applied with no conflicts.
  • main returns to __version__ = "0.7.0"; the 0.8.0 bump stays on the restored branch.
  • Please merge this PR to finalize the undo.

…-05-28"

This reverts commit dd40808, reversing
changes made to 62e83b6.
@settylab-dotto-bot settylab-dotto-bot Bot requested a review from katosh as a code owner May 29, 2026 19:14
@settylab-dotto-bot settylab-dotto-bot Bot merged commit 27271f3 into main May 29, 2026
5 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant