Mercurial > hgsubversion

changeset 297:1611834e39ee

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Prevent '.hg/svn/url' from overriding a URL specified on the command line.
author Dan Villiom Podlaski Christiansen <danchr@gmail.com>
date Fri, 27 Mar 2009 02:17:33 +0100
parents 9be04de434ed
children 32d3f1716e66
files svncommand.py
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/svncommand.py
+++ b/svncommand.py
@@ -35,7 +35,7 @@ def svncmd(ui, repo, subcommand, *args, 
     path = os.path.dirname(repo.path)
     try:
         commandfunc = svn_subcommands[subcommand]
-        if commandfunc not in svn_commands_nourl:
+        if commandfunc not in svn_commands_nourl and not opts['svn_url']:
             opts['svn_url'] = open(os.path.join(repo.path, 'svn', 'url')).read()
         return commandfunc(ui, args=args,
                            hg_repo_path=path,