tests/test-rebuildstate.out

more whitespace cleanup and some other style nits

adding bar
adding foo
% state dump after
n 666         -1 bar
n 666         -1 foo
% status
! bar
? baz
C foo