diff -r 8f42d8c412c8 -r 173bdb502503 mercurial/patch.py --- a/mercurial/patch.py Sat Oct 08 08:54:05 2016 -0700 +++ b/mercurial/patch.py Sat Oct 08 05:26:58 2016 -0700 @@ -1952,8 +1952,10 @@ data, mode = None, None if gp.op in ('RENAME', 'COPY'): data, mode = store.getfile(gp.oldpath)[:2] - # FIXME: failing getfile has never been handled here - assert data is not None + if data is None: + # This means that the old path does not exist + raise PatchError(_("source file '%s' does not exist") + % gp.oldpath) if gp.mode: mode = gp.mode if gp.op == 'ADD':