diff -r 00a0ab08f986 -r d68ddccf276b hgext/rebase.py --- a/hgext/rebase.py Sun May 08 23:27:48 2011 +0200 +++ b/hgext/rebase.py Tue May 10 16:08:46 2011 -0500 @@ -132,7 +132,7 @@ if basef: raise util.Abort(_('cannot specify a base with detach')) - cmdutil.bail_if_changed(repo) + cmdutil.bailifchanged(repo) result = buildstate(repo, destf, srcf, basef, detachf) if not result: # Empty state built, nothing to rebase @@ -531,7 +531,7 @@ ui.debug('--update and --rebase are not compatible, ignoring ' 'the update flag\n') - cmdutil.bail_if_changed(repo) + cmdutil.bailifchanged(repo) revsprepull = len(repo) origpostincoming = commands.postincoming def _dummy(*args, **kwargs):