Mercurial > public > mercurial-scm > hg-stable

diff hgext/rebase.py @ 8241:dd1b47e17d7e

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 46293a0c7e9f
children cb08c3765a02
line wrap: on
line diff
--- a/hgext/rebase.py	Tue Apr 28 23:43:58 2009 +0200
+++ b/hgext/rebase.py	Wed Apr 29 11:39:49 2009 +0200
@@ -426,7 +426,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'))