svn source support
Fixed #2994 regression with the resolver

We now keep track of conflicts we have encountered
to resolve the dependencies better
Improved the performance by avoid a O(n) lookup in states
Merge pull request #2995 from MSNexploder/svn

SVN source support