The patch works for the simple test cases I have; thanks.

The problem resulted in a lot of tedium when trying to reorg many files in a repo,
and I have more rounds of this kind of thing planned.  So I'm going to bump the
priority; adjust if you disagree.