Comment 7 for bug 120977

Although the traceback is certainly similar, that's not the same bug -- the "non extant" file being patched was not created by a merge. In fact, that file seems to have an entirely boring revision history, so I don't know what's going on here at all (maybe a mv in the CVS repo?). I'm interested to see if the new import succeeds!

Actually looking a bit more, it looks like someone _copied_ the ,v file in the CVS repo -- I expect the new import will be fine.