diff -r c8c231da59c3 -r aee8455ee8ec tests/test-rebase-pull --- a/tests/test-rebase-pull Sun Apr 26 16:49:47 2009 -0500 +++ b/tests/test-rebase-pull Wed Apr 29 11:39:49 2009 +0200 @@ -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/'