# HG changeset patch
# User Thomas Arendsen Hein <thomas@intevation.de>
# Date 1154070073 -7200
# Node ID 14ebe97542a77721e3a2377fd935ec5bbdf92343
# Parent  79c31b6b9c83bb9f523d93fa93e78cfbeb2643b9# Parent  4af4e1870fa05ef3a4e1a63a76fc447a0920c044
merge with tonfa

diff -r 79c31b6b9c83 -r 14ebe97542a7 mercurial/commands.py
--- a/mercurial/commands.py	Fri Jul 28 09:00:59 2006 +0200
+++ b/mercurial/commands.py	Fri Jul 28 09:01:13 2006 +0200
@@ -3440,6 +3440,11 @@
             else:
                 d = lambda: func(u, *args, **cmdoptions)
 
+            # reupdate the options, repo/.hg/hgrc may have changed them
+            u.updateopts(options["verbose"], options["debug"], options["quiet"],
+                         not options["noninteractive"], options["traceback"],
+                         options["config"])
+
             try:
                 if options['profile']:
                     import hotshot, hotshot.stats