When the dump is not consistent (after filtering for example), handle conflicts caused by copy_from_rev revision number that does not exist any longer by matching to the first previous revision that contains the file name.