Skip to content

Track local-only commits and stash in objectstate-native-forms checkout #63

Open

Description

@trissim

Local-only work in the checkout /home/ts/wt/objectstate-native-forms, checked against origin/main (7313975) with git cherry on 2026-10-16. Nothing has been deleted.

Already carried on main

  • 7b113b828 (agent/pr7-release-fix) "Release 1.1.8 with schema-evolution reconciliation": git cherry shows - (patch-equivalent commit on main).
  • stash@{0} "Historical generated lock": its only content is an untracked uv.lock, blob c9709eb1c95c5b406445dc8c2f65f9315137de2a. The identical blob is published in OpenHCSDev/openhcs (gh api repos/OpenHCSDev/openhcs/git/blobs/c9709eb1c... returns 240364 bytes).

Content carried by later rewrites; not patch-equivalent (branch claude/write-joss-paper-blIEc, merge-base ed1c1dd)

  • b1a8dcdc5 JOSS paper draft. main has paper.md and paper.bib, since expanded (12708ad and earlier). Only JOSS_SUBMISSION_NOTES.md is absent from main; it's a working note.
  • 8ef78569a AI usage disclosure. The same paragraph is on main's paper.md, word for word, under "# AI Usage Disclosure".
  • 34689056c "extracted from OpenHCS monorepo" wording. main states the same fact in its acknowledgements, worded differently.

Not carried, and it can't be applied to main (branch docs/decorator-workflow, merge-base 49a9b57, November 2025, written against the old hieraconf package)

  • 74d8060c9, 339200e3c, d6bacd70b, 982f1a998, daa841f9d, 1e418d6e0: decorator-flow docs, examples, fixtures and tests, a Sphinx CI tweak, and src/hieraconf/* edits.
  • Check: the branch's test files were run against objectstate 5.0.0 with hieraconf renamed to objectstate. 4 of 5 files fail to import because they use APIs main removed (resolve_field_inheritance, set_current_temp_global, clear_current_temp_global). test_placeholder_extended.py fails 5 of its 9 tests. src/hieraconf/ doesn't exist on main.
  • Disposition needed: drop, or rewrite the decorator-flow coverage against the current API as new work. The commits themselves can't be cherry-picked.

The checkout and these branches are left in place until this is decided.

Activity

  1. trissim commented on Oct 16, 2026

    @trissim
    ContributorAuthor

    Decision (coordinator, 2026-10-16): the six hieraconf-era commits are dropped as work. They target APIs that 5.0.0 removed; any wanted coverage gets written fresh against 5.0.0. Archived for reference:

    • archive/objectstate-native-forms-hieraconf = 1e418d6 (docs/decorator-workflow tip; contains 74d8060..1e418d6)
    • archive/objectstate-native-forms-joss = 3468905 (JOSS branch tip; content already on main's paper.md, archived so nothing is lost)
      7b113b828 is patch-equivalent on main. The stash (uv.lock blob c9709eb1c, published in OpenHCSDev/openhcs) is dropped, and the local checkout is removed.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Metadata

Metadata

Assignees

No one assigned

    Labels

    No labels
    No labels

    Type

    No type

    Projects

    No projects

      Milestone

      No milestone

      Relationships

      None yet

      Development

      No branches or pull requests

      Issue actions