Merge main into switch-says 4294602ee66f resolution
Resolves CHANGELOG.md: the #102 entry beside main's #100 and #107 entries. refs #102
- Author
- Andy McCall @andymccall <[email protected]>
- When
- · 2026-10-12 09:22 UTC
- Signature
- ✔ signed by Andy McCall
- Hash
4294602ee66f55d954ea378b4ea5bd35d1847063a917dd6e3bd912d4f7541c00- Depends on
- 34fad4a92451 5d79b5c2de88 8fd78eb52ad2 b689779e9e74 ebb9210bad0c
- Depended on by
- c86270b7c670
- In bookmarks
- bare-hashes carried-not-removed doctor-trust identical-sides keyless-tags main merge-remote-bookmark only-help-103 paths-for-resolutions-and-amend push-notes show-stat subrepo-pin-state switch-says
- In tags
- v0.10.0 v0.11.0 v0.4.4 v0.4.5 v0.4.6 v0.5.0 v0.5.1 v0.6.0 v0.7.0 v0.8.0 v0.9.0
- Edits
- 2 atoms, 0 tree operations, 1 file
Browse the tree at this change
modified CHANGELOG.md +6 −8
| … | 1 unchanged lines |
||
| 2 | 2 | ||
| 3 | 3 | ## Unreleased |
|
| 4 | 4 | ||
| 5 | - | <<<<<<< oxy conflict 1 of 1, side 1 of 2: change 75edb82e "Merge main into carry-identical" |
|
| 6 | - | - **`--carry` takes work the target already has (#100).** Switching bookmarks or checking out with `--carry` refused when uncommitted files were byte-for-byte what the target state holds, as after a proposal of that work landed, leaving only `--discard`. Such work is now already applied: no conflict, nothing to carry, and the rest of the work comes along. |
|
| 7 | - | ||
| 8 | - | - **Binary files' current versions found without whole closures (#107).** Which replacement of a binary file is live was decided by building each replacing change's entire closure; on a history as long as VS Code's (166,000 commits) each is a hundred thousand changes, the memo could not keep them, and `oxy git verify` spent its day rebuilding them. A bounded walk that keeps nothing answers the same. |
|
| 9 | - | ||
| 10 | - | ======= oxy conflict 1 of 1, side 2 of 2: change 456c818e "Merge main into switch-says" |
|
| 11 | - | - **A switch names what it takes off disk (#102).** `oxy bookmark switch` and `oxy checkout` printed only how many files they removed, easy to miss when a switch to a bookmark lacking 80 files took an editor's project file with them. They now name the first few removed files, with a warning when twenty or more go. |
|
| 12 | - | ||
| 5 | + | - **A switch names what it takes off disk (#102).** `oxy bookmark switch` and `oxy checkout` printed only how many files they removed, easy to miss when a switch to a bookmark lacking 80 files took an editor's project file with them. They now name the first few removed files, with a warning when twenty or more go. |
|
| 6 | + | ||
| 7 | + | - **Binary files' current versions found without whole closures (#107).** Which replacement of a binary file is live was decided by building each replacing change's entire closure; on a history as long as VS Code's (166,000 commits) each is a hundred thousand changes, the memo could not keep them, and `oxy git verify` spent its day rebuilding them. A bounded walk that keeps nothing answers the same. |
|
| 8 | + | ||
| 9 | + | - **`--carry` takes work the target already has (#100).** Switching bookmarks or checking out with `--carry` refused when uncommitted files were byte-for-byte what the target state holds, as after a proposal of that work landed, leaving only `--discard`. Such work is now already applied: no conflict, nothing to carry, and the rest of the work comes along. |
|
| 10 | + | ||
| 13 | 11 | - **Binary files' current versions found without whole closures (#107).** Which replacement of a binary file is live was decided by building each replacing change's entire closure; on a history as long as VS Code's (166,000 commits) each is a hundred thousand changes, the memo could not keep them, and `oxy git verify` spent its day rebuilding them. A bounded walk that keeps nothing answers the same. |
|
| 14 | 12 | ||
| 15 | 13 | >>>>>>> oxy conflict 1 of 1 end |
|
| … | 175 unchanged lines |