Merge main into diffusion-pin-bookmark: keep both changelog entries 4b49c41599f3 resolution
- Author
- Andy McCall @andymccall <[email protected]>
- via
- agent
agent:claude@andymccall <[email protected]> · keyless, under your grant for changes,refs,seal · key 8b9ec8f0a5de
- When
- · 2026-10-26 19:25 UTC
- Signature
- ◈ sealed by agent:claude@andymccall
- Hash
4b49c41599f3a29fdc805361569e0eaea120d7e96f1c6212bf7d7814f10481c3- Depends on
- 34388e612963 3e868a1f94e1 a7e6e8e6094c b5668108487f d7e2c2754807
- Depended on by
- 7a91f1fd71b0
- In bookmarks
- diffusion-pin-bookmark main
- In tags
- v0.9.11 v0.9.15 v0.9.16 v0.9.19 v0.9.20 v0.9.21 v0.9.22 v0.9.23 v0.9.24 v0.9.7 v0.9.8 v0.9.9
- Edits
- 2 atoms, 0 tree operations, 1 file
Browse the tree at this change
modified CHANGELOG.md +2 −2
| … | 3 unchanged lines |
||
| 4 | 4 | ||
| 5 | 5 | ## Unreleased |
|
| 6 | 6 | ||
| 7 | - | <<<<<<< oxy conflict 1 of 1, side 1 of 2: change 765ba0f2 "Landed and closed proposals are listed as recorded, not projected again; the list takes a limit (closes #331)" |
|
| 8 | - | - **Listing landed proposals is quick, and pages (#331).** `oh proposal list --state landed` on a repository with a few hundred proposals timed out: the API worked out every proposal's projected state again, landed and closed ones too. Those now come from what was recorded, and the list takes `limit` (`oh proposal list --limit N`, 30 by default), newest first. |
|
| 7 | + | - **A Diffusion bump pins the upstream's default bookmark (#332).** A bump kept the bookmark name of the pin it replaced, so a subrepo first pinned at an upstream proposal's bookmark still named it after the proposal landed and Diffusion moved the pin to the default bookmark's state; a checkout then counted the subrepo as on another bookmark. A bump now names the upstream's default bookmark, unless it keeps pinned changes that bookmark lacks. |
|
| 8 | + | - **Listing landed proposals is quick, and pages (#331).** `oh proposal list --state landed` on a repository with a few hundred proposals timed out: the API worked out every proposal's projected state again, landed and closed ones too. Those now come from what was recorded, and the list takes `limit` (`oh proposal list --limit N`, 30 by default), newest first. |
|
| 9 | 9 | ======= oxy conflict 1 of 1, side 2 of 2: change 030afc2b "Diffusion: a bump pins the upstream's default bookmark, not the old pin's (closes #332)" |
|
| 10 | 10 | - **A Diffusion bump pins the upstream's default bookmark (#332).** A bump kept the bookmark name of the pin it replaced, so a subrepo first pinned at an upstream proposal's bookmark still named it after the proposal landed and Diffusion moved the pin to the default bookmark's state; a checkout then counted the subrepo as on another bookmark. A bump now names the upstream's default bookmark, unless it keeps pinned changes that bookmark lacks. |
|
| 11 | 11 | >>>>>>> oxy conflict 1 of 1 end |
|
| … | 352 unchanged lines |