urbit/shrub
1
1
Fork 0
mirror of https://github.com/urbit/shrub.git synced 2025-01-05 19:46:50 +03:00
Code Issues Packages Projects Releases Wiki Activity

Some %fine merges weren't doing anything, oops

Browse Source
This commit is contained in:
Jared Hance 2014-08-06 09:49:10 -04:00
parent 6bc5ecd9ad
commit 24f522281c
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
arvo/zuse.hoon
View File

@ -1653,17 +1653,21 @@
=+ owr=(~(got by hit) let)
?: =(der owr)
[~ ~]
?: (~(has in (zule owr)) der)
[~ ~]
?. (~(has in (zule der)) owr)
~ :: not a fast forward
~& [%merge-fine p.sab q.sab]
[~ [~ [let.for hit.for hut lat]]]
[~ [~ [+(let) (~(put by hit) +(let) der) hut lat]]]
?(%mate %that %this %meld)
=+ foreign-head=(~(got by hut) (~(got by hit.for) let.for))
=+ our-head=(~(got by hut) (~(got by hit) let))
?: &(|(=(gem %mate) =(gem %meld)) (~(has in (zule r.foreign-head)) r.our-head))
$(gem %fine) :: use fast forward
?: =(r.foreign-head r.our-head)
[~ ~] :: up to date
?: (~(has in (zule r.our-head)) r.foreign-head)
[~ ~] :: up to date
?: &(|(=(gem %mate) =(gem %meld)) (~(has in (zule r.foreign-head)) r.our-head))
$(gem %fine) :: use fast forward
=+ gar=(mer our-head foreign-head now (strat gem))
=+ yak=-.gar
=+ hek=+.gar