[urbit] Bad merging from ~doznec

Philip Monk

2015-09-03 21:07:21 UTC

Some of this stuff is rather broken at the moment, unfortunately. This is
the same problem ~doznec ran into yesterday when it was up and down a lot.
I'm in the process of doing a deep clean of clay (I think I've identified
this problem, for example), though it will likely be a breaching change.
Anton's workaround, which works for ~doznec, is on the pending branch, so
if you manually put that into your home desk and reload clay, it should get
you past this. The merge strategy thing is also fixed.

Post by c***@gmail.com
After telling :talk that webtalk was still broken for me, someone
recommended that I run `|merge %base ~doznec %kids` in order to merge in
the changes that haven't synced. Unfortunately, something terrible seems to
have happened - I'm now getting spammed with lots of error traces from
%clay, which started after I'm pretty sure I got an error message saying I
had to manually merge in the deck myself. I can't actually find that
message, though, because of the error traces, and can't figure out how to
pass in the merge stratagy of %that to `|merge` to just dump my own
changes. Reading over cat/hood/merge.hoon it's pulling the stratagy from a
(map ,%gem germ) that isn't in the args arm...is it actually possibly to
tell |merge what method to try anymore? Would reloading %clay fix this
somehow? :/ I can't seem to use :talk right now either, hence asking here.
[%swim-take-vane %c %writ ~]
/~zod/home/~2015.9.1..00.16.23..68b7/arvo/clay/:<[2.567 3].[2.730 5]>
/~zod/home/~2015.9.1..00.16.23..68b7/arvo/clay/:<[2.568 3].[2.730 5]>
/~zod/home/~2015.9.1..00.16.23..68b7/arvo/clay/:<[2.569 5].[2.585 15]>
/~zod/home/~2015.9.1..00.16.23..68b7/arvo/clay/:<[2.570 5].[2.585 15]>
/~zod/home/~2015.9.1..00.16.23..68b7/arvo/clay/:<[2.571 5].[2.585 15]>
/~zod/home/~2015.9.1..00.16.23..68b7/arvo/clay/:<[2.572 5].[2.585 15]>
/~zod/home/~2015.9.1..00.16.23..68b7/arvo/clay/:<[2.573 5].[2.585 15]>
/~zod/home/~2015.9.1..00.16.23..68b7/arvo/clay/:<[2.574 5].[2.585 15]>
/~zod/home/~2015.9.1..00.16.23..68b7/arvo/clay/:<[2.575 5].[2.585 15]>
/~zod/home/~2015.9.1..00.16.23..68b7/arvo/clay/:<[2.576 5].[2.585 15]>
/~zod/home/~2015.9.1..00.16.23..68b7/arvo/clay/:<[2.582 5].[2.585 15]>
/~zod/home/~2015.9.1..00.16.23..68b7/arvo/clay/:<[2.583 7].[2.584 58]>
/~zod/home/~2015.9.1..00.16.23..68b7/arvo/clay/:<[2.584 7].[2.584 58]>
/~zod/home/~2015.9.1..00.16.23..68b7/arvo/clay/:<[2.584 12].[2.584 58]>
/~zod/home/~2015.9.1..00.16.23..68b7/arvo/clay/:<[2.584 17].[2.584 58]>
/~zod/home/~2015.9.1..00.16.23..68b7/arvo/clay/:<[1.716 9].[1.725 11]>
/~zod/home/~2015.9.1..00.16.23..68b7/arvo/clay/:<[1.717 9].[1.725 11]>
/~zod/home/~2015.9.1..00.16.23..68b7/arvo/clay/:<[1.718 29].[1.718 50]>
/~zod/home/~2015.9.1..00.16.23..68b7/arvo/clay/:<[1.757 9].[1.922 11]>
/~zod/home/~2015.9.1..00.16.23..68b7/arvo/clay/:<[1.758 9].[1.922 11]>
/~zod/home/~2015.9.1..00.16.23..68b7/arvo/clay/:<[1.760 9].[1.922 11]>
/~zod/home/~2015.9.1..00.16.23..68b7/arvo/clay/:<[1.763 9].[1.922 11]>
/~zod/home/~2015.9.1..00.16.23..68b7/arvo/clay/:<[1.765 9].[1.922 11]>
/~zod/home/~2015.9.1..00.16.23..68b7/arvo/clay/:<[1.766 9].[1.922 11]>
/~zod/home/~2015.9.1..00.16.23..68b7/arvo/clay/:<[1.768 9].[1.922 11]>
/~zod/home/~2015.9.1..00.16.23..68b7/arvo/clay/:<[1.769 9].[1.922 11]>
/~zod/home/~2015.9.1..00.16.23..68b7/arvo/clay/:<[1.771 9].[1.922 11]>
/~zod/home/~2015.9.1..00.16.23..68b7/arvo/clay/:<[1.772 9].[1.922 11]>
/~zod/home/~2015.9.1..00.16.23..68b7/arvo/clay/:<[1.773 9].[1.922 11]>
/~zod/home/~2015.9.1..00.16.23..68b7/arvo/clay/:<[1.832 11].[1.921 19]>
/~zod/home/~2015.9.1..00.16.23..68b7/arvo/clay/:<[1.834 11].[1.921 19]>
/~zod/home/~2015.9.1..00.16.23..68b7/arvo/clay/:<[1.834 15].[1.834 64]>
/~zod/home/~2015.9.1..00.16.23..68b7/arvo/clay/:<[1.834 16].[1.834 53]>
/~zod/home/~2015.9.1..00.16.23..68b7/arvo/clay/:<[1.834 25].[1.834 52]>
/~zod/home/~2015.9.1..00.16.23..68b7/arvo/clay/:<[1.538 7].[1.545 28]>
/~zod/home/~2015.9.1..00.16.23..68b7/arvo/clay/:<[1.539 7].[1.545 28]>
/~zod/home/~2015.9.1..00.16.23..68b7/arvo/clay/:<[1.539 11].[1.539 29]>
/~zod/home/~2015.9.1..00.16.23..68b7/arvo/clay/:<[1.539 13].[1.539 29]>
need
--
You received this message because you are subscribed to the Google Groups "urbit" group.
To unsubscribe from this group and stop receiving emails from it, send an
For more options, visit https://groups.google.com/d/optout.

--
You received this message because you are subscribed to the Google Groups "urbit" group.
To unsubscribe from this group and stop receiving emails from it, send an email to urbit-dev+***@googlegroups.com.
To post to this group, send email to urbit-***@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.