This seems like a cheap trick. It doesn't properly account for a
file that gets renamed between patch set 1 and patch set 2. We
will wind up packing the wrong Patch object because we didn't do
proper rename detection between the patch sets.
