Revert almost all of 5be434785317; add a test Because of file copies, we should update the manifest dict only after committing all files.

%% Should show unknown
? unknown
removing b
%% Should show unknown and b removed
R b
? unknown
%% Should show a and unknown
a
unknown