OXYGENHUB

CHANGELOG: one #148 entry (the merge kept both sides' copy) aa137bb8e77d

Author
Andy McCall @andymccall <[email protected]>
via
agent agent:claude@andymccall <[email protected]> · keyless, under your grant for changes,refs,seal · key 7ec6cc10c1bc
When
· 2026-10-27 00:00 UTC
Signature
◈ sealed by agent:claude@andymccall
Hash
aa137bb8e77d7078508373ca5864ec23cc072164b9cd2c10407798ee85a8bc3e
Depends on
8fd78eb52ad2 fa53a2849de8
Depended on by
nothing yet
In bookmarks
main subrepo-pin-state
In tags
v0.10.0 v0.11.0 v0.8.0 v0.9.0
Edits
1 atom, 0 tree operations, 1 file

Browse the tree at this change

hide whitespace changes
modified CHANGELOG.md +0 −2
… 
5 unchanged lines
6 6 

    

  
    

      7
      7
       
      
- **Identical sides settle by themselves (#146).** Two bookmarks that each resolved the same conflict to the same text conflicted again when merged, both sides the identical lines. A conflict whose sides are byte-identical now settles as `merge=union` adjacent insertions do (#145), in any file and keeping one side: a checkout writes it once ("kept one of its identical sides") and the next commit records the resolution, and a host landing a proposal settles it too.

    

  
    

      8
      8
       
      

    

  
    

      9
      
      -
      
- **A server can add a note to a reference a push moved (#148).** `oxy-server`'s `Backend` has a `push_notes` step: each note is added to that accepted reference's result, which `oxy push` shows in place of "updated". OxygenHub will use it to say when a push moves the bookmark of a proposal that has already landed (oxygenhub#329).

    

  
    

      10
      
      -
      

    

  
    

      11
      9
       
      
- **A subrepo at its pinned state is unmodified on any bookmark (#147).** A subrepo whose heads were exactly its pin's but which sat on another bookmark than the pin named counted as modified, so `oxy bookmark switch` refused ("the working copy has changes"). Only the state counts now: the same repository at the same heads, or the same Git commit; the recorded pin stands.

    

  
    

      12
      10
       
      

    

  
    

      13
      11
       
      
- **A shallow clone fetches its checkpoint in parts (#137).** The checkpoint of a big state came as one answer, the whole state's graph blobs in one body (about 2 GB for the VS Code history), built and held whole on both sides. A server now answers `checkpoint-index` (the checkpoint and its history, no graphs), and the client fetches the graph blobs it lacks with `objects`, 2,048 at a time; `objects` reads them in pack order. An older server answers 404 and gets the one-piece request as before.

    

  
    

      
      
      …
      
285 unchanged lines