Skip to content
Snippets Groups Projects
Commit aee8455ee8ec authored by Martijn Pieters's avatar Martijn Pieters
Browse files

Fix typeerror when specifying both --rebase and --pull

parent c8c231da59c3
No related branches found
No related tags found
No related merge requests found
......@@ -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'))
......
......@@ -53,6 +53,10 @@
hg glog --template '{rev}\n' -l 1
echo
echo "% pull --rebase --update should ignore --update"
hg pull --rebase --update 2>&1 | sed 's/\(pulling from \).*/\1/'
echo
echo "% pull --rebase doesn't update if nothing has been pulled"
hg up 1
hg pull --rebase 2>&1 | sed 's/\(pulling from \).*/\1/'
......
......@@ -44,6 +44,11 @@
@ 2
|
% pull --rebase --update should ignore --update
pulling from
searching for changes
no changes found
% pull --rebase doesn't update if nothing has been pulled
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
pulling from
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment