On Wed, Aug 27, 2008 at 10:21 AM, David Roundy <[EMAIL PROTECTED]> wrote: > On Wed, Aug 27, 2008 at 10:19:18AM -0700, Jason Dagit wrote: >> On Wed, Aug 27, 2008 at 10:13 AM, David Roundy <[EMAIL PROTECTED]> wrote: >> > On Wed, Aug 27, 2008 at 12:17 PM, David Roundy <[EMAIL PROTECTED]> wrote: >> >> On Tue, Aug 26, 2008 at 10:30:41PM -0700, Jason Dagit wrote: >> >>> David, >> >>> >> >>> Below is a big important set of patches. Sorry if it's a bit >> >>> overwhelming. >> >>> >> >>> If you've already commented on my 'fix accidental reversal in >> >>> tentativelyAddToPending' patch then I missed it. Basically, if you look >> >>> at >> >>> my patch, 'Make Darcs.Repository.Internal compile with type witnesses.', >> >>> you see that the hunk around line 577 swaps the order of concatenation. >> >>> I've >> >>> fixed it, but the patch doesn't seem to be in darcs.net yet that's why >> >>> I'm >> >>> resending. >> >>> >> >>> That's the most critical patch in the bunch. The rest do some >> >>> refactoring >> >>> and commenting, and confilct resolving, as well as adding a test case and >> >>> fix for the bug we found in unrevert. >> >>> >> >>> The exciting patch is 'extensive type witnesses refactor for commands'. >> >>> That's >> >>> a big monumental patch. I've tried to document all my uses of >> >>> unsafeCoerceP >> >>> as to how I undertand why they are needed. More work to be done on the >> >>> type witness front, but this makes all the modules compile with type >> >>> witnesses! >> >>> Although, I didn't record a patch to the makefile to make that so. I'm >> >>> a bit >> >>> tired at the moment to think of the best way to make that change. >> >>> >> >>> Also, note that I didn't bother folding view_changes in Changes into the >> >>> type >> >>> witnesses yet. I worked on that quite a bit, but in the end it seemed >> >>> like >> >>> a waste of time right now. So that means diff and changes both have some >> >>> unsafe bits. >> >>> >> >>> Let me know what you think! >> >>> >> >>> Thanks! >> >>> Jason >> >>> >> >>> Tue Aug 12 22:38:37 PDT 2008 Jason Dagit <[EMAIL PROTECTED]> >> >>> * partial type witnesses in Unrevert >> >>> >> >>> Mon Aug 25 11:32:35 PDT 2008 Jason Dagit <[EMAIL PROTECTED]> >> >>> * add double-unrevert.sh test >> >>> >> >>> Mon Aug 25 11:59:07 PDT 2008 Jason Dagit <[EMAIL PROTECTED]> >> >>> * Finish refactor of Unrevert as well as making it pass >> >>> double-unrevert.sh >> >> >> >> Applied up to here! >> > >> > Alas, they fail tests, so these haven't been applied after all. >> >> More details please. They work for me. > > $ make -j2 witnesses > PATH=".:$PATH" darcs changes --context | cat config.command - \ > | ./stringify Context context > src/Context.hs > perl release/determine_release_state.pl 2.0.2 > release/STATE > Rebuild dependencies ... > [ghc] src/ThisVersion.o > [ghc] src/Darcs/Resolution.o > [ghc] src/Darcs/Repository/Internal.o > > src/Darcs/Repository/Internal.lhs:582:83: > Couldn't match expected type `t' against inferred type `u' > `t' is a rigid type variable bound by > the type signature for `tentativelyAddToPending' > at src/Darcs/Repository/Internal.lhs:572:40 > `u' is a rigid type variable bound by > the type signature for `tentativelyAddToPending' > at src/Darcs/Repository/Internal.lhs:572:38 > Expected type: FL Prim t y > Inferred type: FL Prim u y > In the second argument of `newpend', namely `patch' > In the second argument of `($)', namely > `newpend (unsafeCoerceP pend :: FL Prim r t) patch' > make: *** [src/Darcs/Repository/Internal.o] Error 1 > > $ darcs changes --last 7 > Mon Aug 25 14:59:07 EDT 2008 Jason Dagit <[EMAIL PROTECTED]> > * Finish refactor of Unrevert as well as making it pass double-unrevert.sh > > Mon Aug 25 14:32:35 EDT 2008 Jason Dagit <[EMAIL PROTECTED]> > * add double-unrevert.sh test > > Wed Aug 13 01:38:37 EDT 2008 Jason Dagit <[EMAIL PROTECTED]> > * partial type witnesses in Unrevert > > Tue Aug 26 04:26:38 EDT 2008 Eric Kow <[EMAIL PROTECTED]> > * More ChangeLog entries since 2.0.2 > > Wed Aug 27 11:27:10 EDT 2008 David Roundy <[EMAIL PROTECTED]> > * fix bug in defaultrepo. > > Mon Aug 25 20:36:05 EDT 2008 Jason Dagit <[EMAIL PROTECTED]> > * fix accidental reversal in tentativelyAddToPending
Oh, it's not just that you've applied those three patches, but you've also applied this fix accidental reversal one. Odd that I can't pull it from darcs.net. $ darcs pull http://darcs.net This is the darcs darcs repository. ********************** No remote changes to pull in! [10:42 [EMAIL PROTECTED]/local-data/darcs2-clean2] $ darcs changes -p 'accidental reversal' But, that's the reason you're getting the compile error. If you had also applied my patch: Tue Aug 26 20:57:03 PDT 2008 Jason Dagit <[EMAIL PROTECTED]> * Fix conflict in Internal You wouldn't be getting this error. On the other hand, I no longer have that patch locally because it disappeared when I unrecorded the big refactor to commands. What do you want to do about it? I'd rather have you examine my other patch bundle, the one with the refactor to commands and either reject the whole thing or apply the whole thing. From a practical stand point, I can't all the patches in that bundle to ensure they compile individually. Jason _______________________________________________ darcs-users mailing list [email protected] http://lists.osuosl.org/mailman/listinfo/darcs-users
