Patch Set 2:

If you want to submit this change, you need to also submit its parent ("Implement a Dircache checkout (needed for merge)") or cherry-pick it directly onto current master so it doesn't have that dependency.