SBPro
d6f334b861
When josh-proxy rejects a reverse sync push due to unmappable merge commits, fall back to linearizing: cherry-pick regular commits individually, squash only the merge commits via cherry-pick -m 1. Also adds a recommended Git workflow section to the guide explaining where cross-branch merges should happen (monorepo) vs feature work (subrepo), and expands troubleshooting for the "josh rejected push" error with root cause analysis and prevention advice. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
64 lines
3.8 KiB
Markdown
64 lines
3.8 KiB
Markdown
# Changelog
|
|
|
|
## 1.3.0
|
|
|
|
### Features
|
|
|
|
- **Linearize fallback for reverse sync**: When josh-proxy rejects a push due to unmappable merge commits, reverse sync automatically falls back to linearizing the history — cherry-picking regular commits individually and squashing only the problematic merge commits via `cherry-pick -m 1`. Preserves individual commit granularity while handling complex merge topologies that josh cannot map. PR body notes when linearization was used.
|
|
|
|
### Docs
|
|
|
|
- Expanded troubleshooting guide for "Josh rejected push" with root cause analysis and prevention advice.
|
|
- Added ADR-011: Linearize fallback for reverse sync.
|
|
|
|
## 1.2.0
|
|
|
|
### Features
|
|
|
|
- **File exclusion**: `exclude` config field removes files/directories from the subrepo at the josh-proxy transport layer. Patterns are embedded inline in the josh-proxy URL using `:exclude[::pattern,...]` syntax — no extra files to generate or commit.
|
|
- **Filter change reconciliation**: When the josh filter changes (e.g., adding/removing exclude patterns), josh-sync automatically creates a reconciliation merge commit that connects old and new histories. No manual reset or force-push required.
|
|
- **Tree comparison guard**: Reverse sync now compares subrepo tree to josh-filtered tree before checking commit log. Skips immediately when trees are identical, avoiding false positives from reconciliation merge history.
|
|
- **Unrelated histories detection**: Forward sync detects when histories are unrelated (no common ancestor) and falls back to reconciliation instead of creating a useless conflict PR.
|
|
|
|
### Fixes
|
|
|
|
- Pre-v1.2 state compatibility: When upgrading from v1.0/v1.1 (no `josh_filter` stored in state), the old filter is derived from `subfolder` so reconciliation triggers correctly.
|
|
- Reconciliation merge parent order: Josh-filtered history is always first parent so josh-proxy can follow first-parent traversal back to the monorepo.
|
|
- Reverse sync `--ancestry-path` flag prevents old subrepo history from leaking through reconciliation merge parents.
|
|
- PR body `\n` now renders as actual newlines instead of literal text.
|
|
- Conflict result no longer updates sync state (added `continue` to skip state write).
|
|
- `action.yml` now copies VERSION file for correct `--version` output in CI.
|
|
- `.gitignore` now includes `dist/` and `.env`.
|
|
|
|
## 1.1.0
|
|
|
|
### Features
|
|
|
|
- **`onboard` command**: Interactive, resumable workflow for importing existing subrepos into the monorepo. Walks through: prerequisites check, import (creates PRs), wait for merge, reset (pushes josh-filtered history). Checkpoint/resume at every step.
|
|
- **`migrate-pr` command**: Migrates open PRs from an archived subrepo to the new one. Supports interactive selection, `--all` flag, and specific PR numbers. Uses `git apply --3way` for resilient patch application.
|
|
- **Onboard state tracking**: Stored on the `josh-sync-state` branch at `<target>/onboard.json`. Tracks step progress, import PR numbers, reset branches, and migrated PRs.
|
|
|
|
## 1.0.0
|
|
|
|
Initial release. Extracted from [private-monorepo-example](https://code.itkan.io/pe/private-monorepo-example) into a standalone reusable library.
|
|
|
|
### Features
|
|
|
|
- Bidirectional sync: forward (mono → subrepo) and reverse (subrepo → mono)
|
|
- Multi-target support via `.josh-sync.yml` config
|
|
- Per-target credential overrides (SSH keys, HTTPS tokens)
|
|
- Force-with-lease safety for forward sync
|
|
- Loop prevention via git trailers
|
|
- State tracking on orphan branch (`josh-sync-state`)
|
|
- Initial import and subrepo reset commands
|
|
- Composite action for Gitea/GitHub CI
|
|
- Nix flake with devenv module
|
|
- Preflight validation checks
|
|
- Config schema (JSON Schema)
|
|
|
|
### Breaking Changes (vs. inline scripts)
|
|
|
|
- Python + pyyaml replaced by yq-go (single static binary)
|
|
- 7 separate scripts replaced by single `josh-sync` CLI
|
|
- Consumer workflows use composite action (`uses: https://your-gitea/org/josh-sync@v1`)
|