Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
# Changelog

## Unreleased
## 0.7.19 - 2026-11-15

对使用者的影响:修复 `line merge` / `line sync` / `task merge` 的 `--push` 在 `push.default=upstream` 且分支上游指向别的远端分支时,会把合并结果推到那个分支(例如 `main`)的问题;新增 `dyro line add-repo`、`dyro line push` 与 `line merge --abort`。推送说明有改动,已 seed 的工作区升级后运行一次 `dyro host seed --force`。

- 新增 `dyro line merge --abort` 与 `dyro line merge-into-base --abort`:放弃未完成的合并操作,清理遗留 `MERGE_HEAD`,并在未推送时用 `reset --keep` 撤回本地合并提交。`--recover` 仍只对账、不改 Git;遇到未确认的回滚意图时,不再把该仓记成合并成功。
- 新增 `dyro line add-repo`:把一个已经登记的仓库加入现有开发线。已有子线保持不变;子线只能加入父线里已经有的仓库。
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"

[project]
name = "dyro"
version = "0.7.18"
version = "0.7.19"
description = "DyroEngineeringFlow: local-first automation and delivery control for multi-repository teams"
readme = "README.md"
requires-python = ">=3.11"
Expand Down
2 changes: 1 addition & 1 deletion src/dyro/bridge/skill/SKILL.md
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ release, publish, console, install, or any confirmation/approval field.
```json
{
"protocol": {"major": 1, "minor": 0},
"client": {"name": "dyro-agent-bridge-skill", "version": "0.7.18"},
"client": {"name": "dyro-agent-bridge-skill", "version": "0.7.19"},
"operation": "bridge.capabilities.compact",
"input": {}
}
Expand Down
4 changes: 2 additions & 2 deletions tests/test_cli.py
Original file line number Diff line number Diff line change
Expand Up @@ -2278,6 +2278,6 @@ def test_package_version_matches_pyproject(self) -> None:
from dyro import __version__

metadata = tomllib.loads(Path("pyproject.toml").read_text(encoding="utf-8"))
self.assertEqual(metadata["project"]["version"], "0.7.18")
self.assertEqual(__version__, "0.7.18")
self.assertEqual(metadata["project"]["version"], "0.7.19")
self.assertEqual(__version__, "0.7.19")
self.assertEqual(__version__, metadata["project"]["version"])
2 changes: 1 addition & 1 deletion tests/test_console_artifacts.py
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,7 @@ def test_package_version_is_0_7_16(self) -> None:
from pathlib import Path

metadata = tomllib.loads(Path("pyproject.toml").read_text(encoding="utf-8"))
self.assertEqual(metadata["project"]["version"], "0.7.18")
self.assertEqual(metadata["project"]["version"], "0.7.19")


class ConsoleArtifactServiceTests(WorkspaceCase):
Expand Down
2 changes: 1 addition & 1 deletion tests/test_release_gates.py
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ def test_physics_train_refuses_published_0_6_9_tag(self) -> None:
def test_0_7_release_runs_gates_without_claiming_1_0(self) -> None:
stdout = StringIO()
with redirect_stdout(stdout):
code = main(["--root", str(ROOT), "--release-tag", "v0.7.18"])
code = main(["--root", str(ROOT), "--release-tag", "v0.7.19"])
self.assertEqual(code, 0)
self.assertIn("0.7 gates present", stdout.getvalue())
self.assertNotIn("1.0 gates present", stdout.getvalue())
Expand Down
2 changes: 1 addition & 1 deletion uv.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading