OXYGENHUB

Merge main into bare-hashes c86270b7c670 resolution

Resolves CHANGELOG.md: the #103 entry beside main's #100, #102 and #107 entries.

refs #103
Author
Andy McCall @andymccall <[email protected]>
When
· 2026-10-12 09:40 UTC
Signature
✔ signed by Andy McCall
Hash
c86270b7c6700f896258da00ce69c9e1e124f91e2f3c3d8fe0bbd714646fce1e
Depends on
31d3e932e97a 34fad4a92451 4294602ee66f 8fd78eb52ad2 b689779e9e74
Depended on by
efad40f9ac8e
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
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

show whitespace changes
modified CHANGELOG.md +7 −9
… 
1 unchanged lines
2 2 

    

  
    

      3
      3
       
      
## Unreleased

    

  
    

      4
      4
       
      

    

  
    

      5
      
      -
      
<<<<<<< oxy conflict 1 of 1, side 1 of 2: change 652df4c8 "Merge main into bare-hashes"

    

  
    

      6
      
      -
      
- **Full hashes as `--json` prints them (#103).** A change named by its full 64-digit hash without the `#`, as `oxy bookmark show --json` and the hub's API print heads, resolves wherever a change is named (`bookmark set`, `bookmark create`, `checkout`, …), so JSON output feeds back into commands.

    

  
    

      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 1179334f "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.

    

  
    

      
      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
      +
      

    

  
    

      
      11
      +
      
- **Full hashes as `--json` prints them (#103).** A change named by its full 64-digit hash without the `#`, as `oxy bookmark show --json` and the hub's API print heads, resolves wherever a change is named (`bookmark set`, `bookmark create`, `checkout`, …), so JSON output feeds back into commands.

    

  
    

      12
      12
       
      

    

  
    

      13
      
      -
      
- **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
      
      -
      

    

  
    

      15
      13
       
      
- **`--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.

    

  
    

      16
      14
       
      

    

  
    

      17
      15
       
      
>>>>>>> oxy conflict 1 of 1 end

    

  
    

      
      
      …
      
175 unchanged lines