Comment 5 for bug 248411

I didn't check this specific example but I think some spurious conflicts could be avoided if cherrypicking recorded the same fileid for files added in those revision. As it is now when the branches are merged normally they'll be considered different files and thus conflicting.