From 6cb1505288817457bdb0e3c4d62a2a50b14c97bf Mon Sep 17 00:00:00 2001 From: Philip C Monk Date: Wed, 13 May 2015 17:18:43 -0400 Subject: [PATCH] fixed merges --- base/arvo/clay.hoon | 7 +++++-- base/lib/kiln/core.hook | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/base/arvo/clay.hoon b/base/arvo/clay.hoon index cb47fc374..e6b5de048 100644 --- a/base/arvo/clay.hoon +++ b/base/arvo/clay.hoon @@ -727,8 +727,11 @@ [%done ~ %null !>(~)] =+ (~(get by mim.u.dok) a) ?^ - [%done ~ %mime !>(u.-)] - :^ %cast %mime %done :- ~ - (need (read:ze %x [%ud let.dom] a)) + :+ %cast %mime + =+ (need (need (read-x:ze let.dom a))) + ?: ?=(%& -<) + [%done ~ p.-] + (lobe-to-silk:ze a p.-) == == :: diff --git a/base/lib/kiln/core.hook b/base/lib/kiln/core.hook index 8caa456d6..3212f7bf7 100644 --- a/base/lib/kiln/core.hook +++ b/base/lib/kiln/core.hook @@ -151,11 +151,11 @@ ^+ . (blab [ost %merg /kiln/[syd] our syd her sud gem] ~) :: - ++ fancy-merge :: send to self + ++ fancy-merge :: send to self |= [syd=desk her=@p sud=desk gem=?(%auto germ)] ^+ +> %- blab :_ ~ - [ost %poke /kiln/fancy/[^syd] [our %kiln] %hood-merge [syd her sud gem]] + [ost %poke /kiln/fancy/[^syd] [our %hood] %hood-merge [syd her sud gem]] :: ++ spam |= mes=(list tank)