Mercurial > public > mercurial-scm > hg-stable

diff hgext/rebase.py @ 30287:86f4ef63d507

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
rebase: check for conflicts before continuing When there are unresolved merge conflicts, there is no reason to make the user wait for rebase to process all of the already rebased commits just to complain that it cannot do anything. Abort early.
author timeless <timeless@mozdev.org>
date Wed, 02 Nov 2016 18:59:29 +0000
parents 0fa1a41d04e4
children 318a24b52eeb
line wrap: on
line diff
--- a/hgext/rebase.py	Wed Nov 02 18:45:53 2016 +0000
+++ b/hgext/rebase.py	Wed Nov 02 18:59:29 2016 +0000
@@ -661,6 +661,9 @@
                     _('abort and continue do not allow specifying revisions'))
             if abortf and opts.get('tool', False):
                 ui.warn(_('tool option will be ignored\n'))
+            if contf:
+                ms = mergemod.mergestate.read(repo)
+                cmdutil.checkunresolved(ms)
 
             retcode = rbsrt._prepareabortorcontinue(abortf)
             if retcode is not None: