# HG changeset patch # User Dan Villiom Podlaski Christiansen # Date 1238116653 -3600 # Node ID 1611834e39ee5e61e26156613282362eb6b1be6f # Parent 9be04de434ed3ee0a18c95143e27eb44dbf8a2dd Prevent '.hg/svn/url' from overriding a URL specified on the command line. diff --git a/svncommand.py b/svncommand.py --- 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,