changeset 15196 | 7f78a4137f8f |
parent 15195 | 5b2a3bb06cef |
child 15197 | 7f65ce5cc011 |
--- a/mercurial/commands.py Sat Oct 01 21:49:04 2011 -0400 +++ b/mercurial/commands.py Sat Oct 01 21:51:25 2011 -0400 @@ -3372,11 +3372,11 @@ lock = repo.lock() parents = repo.parents() for patchurl in patches: - patchurl = os.path.join(base, patchurl) if patchurl == '-': ui.status(_('applying patch from stdin\n')) patchfile = ui.fin else: + patchurl = os.path.join(base, patchurl) ui.status(_('applying %s\n') % patchurl) patchfile = url.open(ui, patchurl)