Mercurial > hg-stable

diff hgext/rebase.py @ 8242:aee8455ee8ec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix typeerror when specifying both --rebase and --pull
author Martijn Pieters <mj@zopatista.com>
date Wed, 29 Apr 2009 11:39:49 +0200
parents 92455c1d6f83
children cb08c3765a02 609ce91670d0
line wrap: on
line diff
--- a/hgext/rebase.py	Sun Apr 26 16:49:47 2009 -0500
+++ b/hgext/rebase.py	Wed Apr 29 11:39:49 2009 +0200
@@ -400,7 +400,7 @@
     'Call rebase after pull if the latter has been invoked with --rebase'
     if opts.get('rebase'):
         if opts.get('update'):
-            del opts.get['update']
+            del opts['update']
             ui.debug(_('--update and --rebase are not compatible, ignoring '
                                         'the update flag\n'))