Mercurial Mercurial > hg / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
hgext/rebase.py
changeset 30755 0fbb3a5c188e
parent 30725 c2bd2f77965b
child 30865 01512564ddd5 
--- a/hgext/rebase.py	Mon Jan 09 16:02:56 2017 +0900
+++ b/hgext/rebase.py	Tue Jan 10 09:32:27 2017 +0100
@@ -1316,9 +1316,9 @@
                 ui.debug('--update and --rebase are not compatible, ignoring '
                          'the update flag\n')
 
-            ui.debug('before rebase: ensure working dir is clean\n')
             cmdutil.checkunfinished(repo)
-            cmdutil.bailifchanged(repo)
+            cmdutil.bailifchanged(repo, hint=_('cannot pull with rebase: '
+                'please commit or shelve your changes first'))
 
             revsprepull = len(repo)
             origpostincoming = commands.postincoming
Mercurial