[commit: packages/Cabal] ghc-head: Merge pull request #1331 from 23Skidoo/new-add-source-deps-have-priority (be4e19d)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/Cabal

On branch  : ghc-head
Link       : http://git.haskell.org/?p=packages/Cabal.git;a=commit;h=be4e19d807dcc6ef0d28b74f1d5225188941f070

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

commit be4e19d807dcc6ef0d28b74f1d5225188941f070
Merge: 3b5a516 e8742a5
Author: Mikhail Glushenkov <mikhail.glushenkov at gmail.com>
Date:   Fri May 17 15:17:00 2013 -0700

    Merge pull request #1331 from 23Skidoo/new-add-source-deps-have-priority
    
    Make newly-added add-source deps override previously installed versions.



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

be4e19d807dcc6ef0d28b74f1d5225188941f070
 cabal-install/Distribution/Client/Dependency.hs    |    2 +-
 cabal-install/Distribution/Client/Install.hs       |   50 ++++--
 cabal-install/Distribution/Client/Sandbox.hs       |  167 ++++++++++++--------
 .../Distribution/Client/Sandbox/Timestamp.hs       |   68 ++++----
 cabal-install/Distribution/Client/Sandbox/Types.hs |    6 +-
 cabal-install/Distribution/Client/Setup.hs         |   14 +-
 cabal-install/Main.hs                              |   45 +++---
 7 files changed, 207 insertions(+), 145 deletions(-)