Mercurial > hg

diff tests/test-rebase-pull.out @ 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 92455c1d6f83
children a3d73b3e1f8a
line wrap: on
line diff
--- a/tests/test-rebase-pull.out	Tue Apr 28 23:43:58 2009 +0200
+++ b/tests/test-rebase-pull.out	Wed Apr 29 11:39:49 2009 +0200
@@ -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