Revert almost all of 5be434785317; add a test
Because of file copies, we should update the manifest dict only after
committing all files.
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
adding b
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
adding b