dirstate: fix rebuild; add a test
If rebuild calls invalidate, it will just queue a (re)read of the dirstate
file, while what we really want is to empty the current state.
marked working directory as branch abranchapplying patch from stdinapplying patch from stdinapplying patch from stdinapplying patch from stdin