OXYGENHUB

oxy merge takes a remote's bookmark (#117) proposal #122 landed andymccall wants merge-remote-bookmark into main · 1 change · opened

issue #117 oxy merge does not take a remote bookmark (oxygenhub/develop), though revsets do closed → proposal #122 landed → main landed

conversation (0) changes (1) files (0) projected state ef21e8915348 · 68 heads · browse · json
andymccall opened this proposal

Closes issue #117 (Metal Gear's feedback, 2026-10-18).

oxy merge oxygenhub/develop said 'no bookmark' though oxy log -r oxygenhub/develop worked: merge looked only at local bookmarks. It now also takes a remote's tracking bookmark (as last fetched), as revsets do, and says where it looked when neither exists.

  • crates/oxy-core/src/repo/bookmarks.rs: merge resolves NAME locally, then with remote_bookmark().
  • Test: a fresh clone merges origin/develop without switching; origin/nowhere is refused by name.
  • Help and spec §10.1 say so. Gate green.

andymccall opened

andymccall set labels: bug, gap

Proposal landed

andymccall landed 1 change into main .