Comments
Patch
@@ -1306,6 +1306,10 @@
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)
+
revsprepull = len(repo)
origpostincoming = commands.postincoming
def _dummy(*args, **kwargs):
@@ -72,6 +72,13 @@
searching for changes
no changes found
+Abort pull early if working dir is not clean:
+
+ $ echo L1-mod > L1
+ $ hg pull --rebase
+ abort: uncommitted changes
+ [255]
+ $ hg update --clean --quiet
Invoke pull --rebase and nothing to rebase: