Mercurial Mercurial > mercurial / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
rebase: check for conflicts before continuing
authortimeless <timeless@mozdev.org>
Wed, 02 Nov 2016 18:59:29 +0000
changeset 30273 86f4ef63d507
parent 30272 3d38a0bc774f
child 30274 c1345969f6c5
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.
hgext/rebase.py file | annotate | diff | comparison | revisions
tests/test-rebase-conflicts.t file | annotate | diff | comparison | revisions 
--- 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:
--- a/tests/test-rebase-conflicts.t	Wed Nov 02 18:45:53 2016 +0000
+++ b/tests/test-rebase-conflicts.t	Wed Nov 02 18:59:29 2016 +0000
@@ -73,8 +73,6 @@
 Try to continue without solving the conflict:
 
   $ hg rebase --continue
-  already rebased 3:3163e20567cc "L1" as 3e046f2ecedb
-  rebasing 4:46f0b057b5c0 "L2"
   abort: unresolved merge conflicts (see 'hg help resolve')
   [255]
mercurial