Hey jan, <div>I seem to have sorted it out. There's still some dirty module state, but nothing that's a blocker. If I hit it again today ill be sure to holler. </div><div><br></div><div>Thanks!</div><div>Carter<span></span></div>
<div><br>On Thursday, September 19, 2013, Jan Stolarek wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">As Gabor pointed out, this sounds like problems with rebasing on top of my patches. Carter, have you managed to resolve this? If not then please let me know - I'll try to help.<br>
<br>
Janek<br>
<br>
----- Oryginalna wiadomość -----<br>
Od: "Gabor Greif" <<a href="javascript:;" onclick="_e(event, 'cvml', 'ggreif@gmail.com')">ggreif@gmail.com</a>><br>
Do: "Carter Schonwald" <<a href="javascript:;" onclick="_e(event, 'cvml', 'carter.schonwald@gmail.com')">carter.schonwald@gmail.com</a>><br>
DW: <a href="javascript:;" onclick="_e(event, 'cvml', 'ghc-devs@haskell.org')">ghc-devs@haskell.org</a><br>
Wysłane: środa, 18 wrzesień 2013 23:50:48<br>
Temat: Re: primitive using PrimWrappers rather than PrimOpWrappers?<br>
<br>
$ git pull --rebase<br>
just pulls and then rebases your local commits. It gives up (with an<br>
error message) if there are unstaged changes in the workspace.<br>
<br>
On 9/19/13, Carter Schonwald <<a href="javascript:;" onclick="_e(event, 'cvml', 'carter.schonwald@gmail.com')">carter.schonwald@gmail.com</a>> wrote:<br>
> what does the rebase flag do? I did my rebase via the sourcetree gui app..<br>
><br>
><br>
> On Wed, Sep 18, 2013 at 6:40 PM, Gabor Greif <<a href="javascript:;" onclick="_e(event, 'cvml', 'ggreif@gmail.com')">ggreif@gmail.com</a>> wrote:<br>
><br>
>> I had the same error, turned out that<br>
>> ./sync-all pull --rebase<br>
>> did not correctly terminate, because I had modified files around<br>
>> This helped:<br>
>> ./sync-all pull<br>
>> perl boot<br>
>> ./configure<br>
>> make --keep-going<br>
>><br>
>> HTH,<br>
>><br>
>> Gabor<br>
>><br>
>> On 9/19/13, Carter Schonwald <<a href="javascript:;" onclick="_e(event, 'cvml', 'carter.schonwald@gmail.com')">carter.schonwald@gmail.com</a>> wrote:<br>
>> > hey all,<br>
>> > i just rebased my prefetch patch onto HEAD, and now i'm working on<br>
>> getting<br>
>> > ghc to build<br>
>> ><br>
>> > looks like Data.Primitive.Types is trying to import PrimWrappers rather<br>
>> > than PrimOpWrappers?<br>
>> ><br>
>> > i patched that up in my local build, but that seems to be missing,<br>
>> > unless<br>
>> > i'm overlooking somthing and i'm botching the submodules?<br>
>> ><br>
>><br>
><br>
_______________________________________________<br>
ghc-devs mailing list<br>
<a href="javascript:;" onclick="_e(event, 'cvml', 'ghc-devs@haskell.org')">ghc-devs@haskell.org</a><br>
<a href="http://www.haskell.org/mailman/listinfo/ghc-devs" target="_blank">http://www.haskell.org/mailman/listinfo/ghc-devs</a><br>
<br>
</blockquote></div>