mirror of
https://github.com/urbit/shrub.git
synced 2024-12-24 03:14:30 +03:00
67c5caada8
As described in gen/hood/merge/help.txt
29 lines
1.1 KiB
Plaintext
29 lines
1.1 KiB
Plaintext
:: This tests that syncs are correctly restarted after a breach
|
|
::
|
|
/- spider
|
|
/+ *ph-io
|
|
=, strand=strand:spider
|
|
^- thread:spider
|
|
|= vase
|
|
=/ m (strand ,vase)
|
|
;< az=tid:spider bind:m start-azimuth
|
|
;< ~ bind:m (spawn az ~bud)
|
|
;< ~ bind:m (spawn az ~marbud)
|
|
;< ~ bind:m (real-ship az ~bud)
|
|
;< ~ bind:m (real-ship az ~marbud)
|
|
;< file=@t bind:m (touch-file ~bud %kids %foo)
|
|
;< ~ bind:m (check-file-touched ~marbud %home file)
|
|
:: Merge so that when we unify history with the %only-this merge later, we
|
|
:: don't get a spurious conflict in %home
|
|
::
|
|
;< ~ bind:m (dojo ~marbud "|merge %kids our %home")
|
|
;< ~ bind:m (breach-and-hear az ~bud ~marbud)
|
|
;< ~ bind:m (real-ship az ~bud)
|
|
;< ~ bind:m
|
|
(dojo ~bud "|merge %kids ~marbud %kids, =gem %only-this")
|
|
;< file=@t bind:m (touch-file ~bud %kids %bar)
|
|
;< file=@t bind:m (touch-file ~bud %kids %baz)
|
|
;< ~ bind:m (check-file-touched ~marbud %home file)
|
|
;< ~ bind:m end-azimuth
|
|
(pure:m *vase)
|