Patch Set 2: (4 inline comments)

It took me some time to find out what this change is doing. I was searching for the change in DirCacheCheckout ... In the end I found out that what you are doing is enhancing DirCacheCheckout not to return only conflicting pathes but to report also the reason for the conflict, right?