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

19. single-home %clay %merg task

Browse Source
This commit is contained in:
Joe Bryan 2018-12-13 10:37:01 -05:00
parent d4e9759b28
commit c6ce8c23ff
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/hood/kiln.hoon
View File

@ -67,7 +67,7 @@
{$mont wire @tas beam} ::
{$dirk wire @tas} ::
{$ogre wire $@(@tas beam)} ::
{$merg wire @p @tas @p @tas case germ} ::
{$merg wire @tas @p @tas case germ} ::
{$perm wire ship desk path rite} ::
{$poke wire dock pear} ::
{$wipe wire @ud} ::
@ -410,7 +410,7 @@
=< %- spam
?: =(our her) ~
[(render "beginning sync" sud her syd) ~]
(blab [ost %merg wire our syd her sud ud+let germ] ~)
(blab [ost %merg wire syd her sud ud+let germ] ~)
::
++ mere
|= mes=(each (set path) (pair term tang))
@ -469,7 +469,7 @@
::
++ perform ::
^+ .
(blab [ost %merg /kiln/[syd] our syd her sud cas gem] ~)
(blab [ost %merg /kiln/[syd] syd her sud cas gem] ~)
::
++ fancy-merge :: send to self
|= {syd/desk her/@p sud/desk gem/?($auto germ)}
@ -495,7 +495,7 @@
?~ saw
=> (spam leaf+"%melding %{(trip sud)} into scratch space" ~)
%- blab :_ ~
[ost %merg /kiln/[syd] our (cat 3 syd '-scratch') her sud cas gem]
[ost %merg /kiln/[syd] (cat 3 syd '-scratch') her sud cas gem]
=+ :- "failed to set up conflict resolution scratch space"
"I'm out of ideas"
lose:(spam leaf+-< leaf+-> u.saw)

2
sys/vane/clay.hoon
View File

@ -334,7 +334,7 @@
== == ::
$: $c :: to %clay
$% {$info q/@tas r/nori} :: internal edit
{$merg p/@p q/@tas r/@p s/@tas t/case u/germ} :: merge desks
{$merg p/@tas q/@p r/@tas s/case t/germ:clay} :: merge desks
{$warp p/sock q/riff} ::
{$werp p/ship q/sock r/riff} ::
== == ::

4
sys/vane/dill.hoon
View File

@ -41,7 +41,7 @@
$% {$wegh $~} ::
== ::
++ note-clay ::
$% {$merg p/@p q/@tas r/@p s/@tas t/case u/germ:clay}:: merge desks
$% {$merg p/@tas q/@p r/@tas s/case t/germ:clay} :: merge desks
{$warp p/sock q/riff:clay} :: wait for clay hack
{$wegh $~} ::
{$perm p/ship q/desk r/path s/rite:clay} :: change permissions
@ -298,7 +298,7 @@
=/ myt (flop (need tem))
=/ can (clan:title our)
=. tem ~
=. moz :_(moz [hen %pass / %c %merg our %home our %base da+now %init])
=. moz :_(moz [hen %pass / %c %merg %home our %base da+now %init])
=. moz :_(moz [hen %pass ~ %g %conf [[our ram] %load our %home]])
=. +> (sync %home our %base)
=. +> ?: ?=(?($czar $pawn) can) +>

2
sys/zuse.hoon
View File

@ -752,7 +752,7 @@
{$init our/@p} :: report install
{$into des/desk all/? fis/mode} :: external edit
$: $merg :: merge desks
our/@p des/desk :: target
des/desk :: target
her/@p dem/desk cas/case :: source
how/germ :: method
== ::