Mercurial Mercurial > hg-stable / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
import: join base with patchurl *after* checking for stdin
authorGreg Ward <greg@gerg.ca>
Sat, 01 Oct 2011 21:51:25 -0400
changeset 15196 7f78a4137f8f
parent 15195 5b2a3bb06cef
child 15197 7f65ce5cc011
import: join base with patchurl *after* checking for stdin This only matters when using the deprecated --base option, and combining --base with a patch on stdin makes no sense. But it's such an obvious bug and easy fix that I couldn't pass it by.
mercurial/commands.py file | annotate | diff | comparison | revisions 
--- 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)
hg-stable