[commit: Cabal] master: build conflict sets (e2bf99d)

[Ian Lynagh]

Repository : ssh://darcs.haskell.org//srv/darcs/packages/Cabal

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/e2bf99ddd03298db13471fa1e7b04c6ec7786f35

>---------------------------------------------------------------

commit e2bf99ddd03298db13471fa1e7b04c6ec7786f35
Author: Andres Loeh <andres at well-typed.com>
Date:   Mon Jun 20 14:34:43 2011 +0000

    build conflict sets

 .../Client/Dependency/Modular/Assignment.hs        |    6 ++--
 .../Client/Dependency/Modular/Builder.hs           |    4 +-
 .../Client/Dependency/Modular/Dependency.hs        |   10 +++---
 .../Client/Dependency/Modular/Explore.hs           |    4 +-
 .../Client/Dependency/Modular/Preference.hs        |   37 ++++++++++---------
 .../Distribution/Client/Dependency/Modular/Tree.hs |   29 +++++++++------
 .../Client/Dependency/Modular/Validate.hs          |   14 ++++----
 7 files changed, 55 insertions(+), 49 deletions(-)


Diff suppressed because of size. To see it, use:

    git show e2bf99ddd03298db13471fa1e7b04c6ec7786f35