OXYGENHUB

Merge main into subrepo-pin-state: keep both changelog entries 7a3cc5149a14 resolution

Author
Andy McCall @andymccall <[email protected]>
via
agent agent:claude@andymccall <[email protected]> · keyless, under your grant for changes,refs,seal · key c97169c73205
When
· 2026-10-26 19:25 UTC
Signature
◈ sealed by agent:claude@andymccall
Hash
7a3cc5149a1462290d018fa2b022c6dadfc89ce48dd3222db48712431fcc1ab6
Depends on
642fa213de80 80b069facc69 8fd78eb52ad2 b5e98094eb8f e4595038502a
Depended on by
fa53a2849de8
In bookmarks
main subrepo-pin-state
In tags
v0.10.0 v0.11.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 +4 −4
… 
1 unchanged lines
2 2 

    

  
    

      3
      3
       
      
## Unreleased

    

  
    

      4
      4
       
      

    

  
    

      5
      
      -
      
<<<<<<< oxy conflict 1 of 1, side 1 of 2: change b8def1cd "oxy-server: a host can add a note to a reference a push moved (closes #148)"

    

  
    

      6
      
      -
      
- **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).

    

  
    

      7
      
      -
      

    

  
    

      8
      
      -
      
======= oxy conflict 1 of 1, side 2 of 2: change d5afc430 "A subrepo at its pinned state is unmodified on any bookmark (closes #147)"

    

  
    

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

    

  
    

      
      6
      +
      

    

  
    

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

    

  
    

      
      8
      +
      

    

  
    

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

    

  
    

      10
      10
       
      

    

  
    

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

    

  
    

      
      
      …
      
286 unchanged lines