Revert almost all of 5be434785317; add a test
Because of file copies, we should update the manifest dict only after
committing all files.
%% no changes
%% no changes
%% uncompressed contents in repo
this is a test
%% uncompress our working dir copy
this is a test
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
%% uncompress our new working dir copy
this is a test