-
Notifications
You must be signed in to change notification settings - Fork 14
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Nonidem2.0 -- merge non-idempotent branch once it is fixed #96
base: master
Are you sure you want to change the base?
Commits on Oct 19, 2013
-
Configuration menu - View commit details
-
Copy full SHA for 06a903d - Browse repository at this point
Copy the full SHA 06a903dView commit details
Commits on Nov 6, 2013
-
Merge branch 'master' into nonidem
Conflicts: haskell/lvish/Control/LVish.hs haskell/lvish/Control/LVish/Sched.hs haskell/lvish/Data/LVar/IVar.hs haskell/lvish/Data/LVar/PureMap.hs haskell/lvish/Data/LVar/SLMap.hs haskell/lvish/lvish.cabal haskell/lvish/tests/LVishAndIVar.hs
Configuration menu - View commit details
-
Copy full SHA for fad11df - Browse repository at this point
Copy the full SHA fad11dfView commit details -
Configuration menu - View commit details
-
Copy full SHA for 30ee05b - Browse repository at this point
Copy the full SHA 30ee05bView commit details -
Add a -fdedup cabal flag to toggle [non]-idemp mode.
It is still controlled by a dynamic flag, however.
Configuration menu - View commit details
-
Copy full SHA for 5a934d0 - Browse repository at this point
Copy the full SHA 5a934d0View commit details
Commits on Dec 14, 2013
-
Merge branch 'master' into nonidem
Conflicts: haskell/lvish/Control/LVish/Sched.hs
Configuration menu - View commit details
-
Copy full SHA for 7073b11 - Browse repository at this point
Copy the full SHA 7073b11View commit details -
Configuration menu - View commit details
-
Copy full SHA for 76b38c5 - Browse repository at this point
Copy the full SHA 76b38c5View commit details -
Update tests for nonidem branch.
Still seeing problematic failures on v9f for instance.
Configuration menu - View commit details
-
Copy full SHA for 8e29c46 - Browse repository at this point
Copy the full SHA 8e29c46View commit details
Commits on Jan 24, 2014
-
Merge branch 'master' into nonidem
Conflicts: haskell/lvish/Control/LVish/Basics.hs haskell/lvish/Control/LVish/Sched.hs haskell/lvish/Control/LVish/SchedQueue.hs haskell/lvish/lvish.cabal haskell/lvish/tests/SkipListTests.hs
Configuration menu - View commit details
-
Copy full SHA for fcc0076 - Browse repository at this point
Copy the full SHA fcc0076View commit details -
Configuration menu - View commit details
-
Copy full SHA for 0446a1c - Browse repository at this point
Copy the full SHA 0446a1cView commit details -
Configuration menu - View commit details
-
Copy full SHA for 79eca81 - Browse repository at this point
Copy the full SHA 79eca81View commit details
Commits on Feb 6, 2014
-
Merge branch 'master' into nonidem
Conflicts: haskell/DEVLOG.md haskell/lvish/Control/LVish/Sched.hs haskell/lvish/Control/LVish/SchedQueue.hs haskell/lvish/lvish.cabal
Configuration menu - View commit details
-
Copy full SHA for 1296828 - Browse repository at this point
Copy the full SHA 1296828View commit details
Commits on Feb 7, 2014
-
Resolve type errors resulting from merge. But I must have screwed som…
…ething up because 12/70 tests fail.
1Configuration menu - View commit details
-
Copy full SHA for a85cfa0 - Browse repository at this point
Copy the full SHA a85cfa0View commit details
Commits on Oct 26, 2014
-
Merge branch '1.1' into nonidem
Conflicts: haskell/DEVLOG.md haskell/lvish/Control/LVish/Sched.hs haskell/lvish/lvish.cabal haskell/lvish/tests/ArrayTests.hs
Configuration menu - View commit details
-
Copy full SHA for 62f7cd4 - Browse repository at this point
Copy the full SHA 62f7cd4View commit details -
Merge commit 'fbc69bd8a049f1dfb4cf0fed757886aa3d779454' into nonidem2.0
Conflicts: haskell/lvish/Control/LVish.hs haskell/lvish/Control/LVish/DeepFrz.hs haskell/lvish/Data/LVar/Generic/Internal.hs haskell/lvish/Data/LVar/IStructure.hs haskell/lvish/Data/LVar/IVar.hs haskell/lvish/Data/LVar/Internal/Pure.hs haskell/lvish/tests/ArrayTests.hs
Configuration menu - View commit details
-
Copy full SHA for c8968f9 - Browse repository at this point
Copy the full SHA c8968f9View commit details -
Fixup: Get things compiling again after the previous merge.
Minor changes only.
Configuration menu - View commit details
-
Copy full SHA for 0e6fd24 - Browse repository at this point
Copy the full SHA 0e6fd24View commit details -
Merge commit '7bbe2fdbb71b35d019c6aabdc9cf1912dbfc4be0' into nonidem2.0
This is a PAINFUL merge because git failed to track the moved files here. A simple refactor on the upstream has made this more difficult. This is in addition to the file renames that happened on the nonidem branch in the first place. After manually fixing things up, this rev builds and can run tests. But there are significant timeout failures!!! Conflicts: haskell/lvish/Control/LVish.hs haskell/lvish/Control/LVish/Basics.hs haskell/lvish/Control/LVish/DeepFrz.hs haskell/lvish/Control/LVish/Internal.hs haskell/lvish/Control/LVish/Logical.hs haskell/lvish/Control/LVish/Sched.hs haskell/lvish/Control/LVish/SchedIdempotent.hs haskell/lvish/Control/LVish/Unsafe.hs haskell/lvish/Data/LVar/Counter.hs haskell/lvish/Data/LVar/CycGraph.hs haskell/lvish/Data/LVar/Generic/Internal.hs haskell/lvish/Data/LVar/IStructure.hs haskell/lvish/Data/LVar/IVar.hs haskell/lvish/Data/LVar/Internal/Pure.hs haskell/lvish/Data/LVar/LayeredSatMap.hs haskell/lvish/Data/LVar/NatArray.hs haskell/lvish/Data/LVar/PNCounter.hs haskell/lvish/Data/LVar/Pair.hs haskell/lvish/Data/LVar/PureMap.hs haskell/lvish/Data/LVar/PureMap/Unsafe.hs haskell/lvish/Data/LVar/PureSet.hs haskell/lvish/Data/LVar/SLMap.hs haskell/lvish/Data/LVar/SLSet.hs haskell/lvish/Data/LVar/SatMap.hs haskell/lvish/Experimental/BitArray.hs haskell/lvish/Internal/Control/LVish/SchedIdempotent.hs haskell/lvish/lvish.cabal haskell/lvish/tests/ArrayTests.hs haskell/lvish/tests/LVishAndIVar.hs haskell/lvish/tests/SNZITests.hs haskell/lvish/tests/SkipListTests.hs
Configuration menu - View commit details
-
Copy full SHA for c1bc64e - Browse repository at this point
Copy the full SHA c1bc64eView commit details -
Configuration menu - View commit details
-
Copy full SHA for 4067fcc - Browse repository at this point
Copy the full SHA 4067fccView commit details