OXYGENHUB

Merge main into carry-identical 5d79b5c2de88 resolution

Resolves CHANGELOG.md: the #100 entry and main's #107 entry, both kept.

refs #100
Author
Andy McCall @andymccall <[email protected]>
When
· 2026-10-12 07:03 UTC
Signature
✔ signed by Andy McCall
Hash
5d79b5c2de8841ce47c0b34b10c75ede24b2d36b472f95648995cd96e1df270d
Depends on
34fad4a92451 7fc365369758 8fd78eb52ad2 b689779e9e74 fe9586d93fb1
Depended on by
4294602ee66f
In bookmarks
bare-hashes carried-not-removed carry-identical 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

hide whitespace changes
modified CHANGELOG.md +4 −4
… 
1 unchanged lines
2 2 

    

  
    

      3
      3
       
      
## Unreleased

    

  
    

      4
      4
       
      

    

  
    

      5
      
      -
      
<<<<<<< oxy conflict 1 of 1, side 1 of 2: change f94bb288 "carry: work the target already has is no conflict"

    

  
    

      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
      
      -
      
======= oxy conflict 1 of 1, side 2 of 2: change 85b3f27c "Binary files' current versions found without whole closures"

    

  
    

      
      5
      +
      
- **`--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.

    

  
    

      
      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
      9
       
      
- **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.

    

  
    

      10
      10
       
      

    

  
    

      11
      11
       
      
>>>>>>> oxy conflict 1 of 1 end

    

  
    

      
      
      …
      
175 unchanged lines