Mercurial > public > mercurial-scm > hg-stable
diff mercurial/dispatch.py @ 14866:ad6a58581ecd
merge with stable
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Wed, 13 Jul 2011 16:29:28 -0500 |
parents | 67add0f24f83 1c148e935244 |
children | 9a3831d64ae2 |
line wrap: on
line diff
--- a/mercurial/dispatch.py Tue Jul 12 16:36:34 2011 -0500 +++ b/mercurial/dispatch.py Wed Jul 13 16:29:28 2011 -0500 @@ -633,7 +633,7 @@ cmdpats = args[:] if cmd not in commands.norepo.split(): # use the repo from the request only if we don't have -R - if not rpath: + if not rpath and not cwd: repo = req.repo if repo: