Merge "manifest: record the original revision when in -r mode."