OXYGENHUB

Changes up to # f0ef9778e587 touching crates/oxy-core/src/repo/bookmarks.rs · 14

See as swimlanes (independent work side by side)

carry: work the target already has is no conflict
Andy McCall ·
✔ fe9586d93fb1
Several remotes and no origin: a default, and the right comparison
Andy McCall ·
✔ 42ccf504aa50
Catch up a stale bookmark: switch, pull and carry v0.4.1
Andy McCall ·
✔ 72484195899a
Fetch reports how each bookmark stands against the remote's copy
Andy McCall ·
✔ b35df36b7dc5
Remote bookmarks work like local ones; a newer format names the oxy that cannot read it (closes #48, closes #49)
Andy McCall ·
✔ 14edbaaf5291
Rebase: --into-working-copy resolves a conflicted rebase in the working copy (closes #42)
Andy McCall ·
✔ e266b7d4065c
Load history only where no file graph is needed v0.1.0
Andy McCall ·
✔ 57eaac9107df
Never move a subrepo's bookmark backwards from its parent
Andy McCall ·
✔ 1a3b62032ed9
Refuse a bookmark at one head that leaves earlier work out
Andy McCall ·
✔ 4fe7d6045860
Hold the working-copy lock through every working-copy write
Andy McCall ·
✔ 6caacfff1d4f
Merges move clean working copies; checkouts say what blocks them
Andy McCall ·
✔ 1c2bd9abdd4f
bookmark switch --carry takes uncommitted work along
Andy McCall ·
✔ 61e3bce7ea5b
Unbound hosted repositories adopt the first pusher's id
Andy McCall ·
✔ 75167672ebcd
Bookmarks: any number per repository, per-workspace current bookmark (bookmark create|set|delete|list|switch), oxy merge as union of heads, bookmark names resolve everywhere, push -b (spec 0.8 section 10.1)
Andy McCall ·
✔ 7b9809e67c3d