Mercurial > evolve

changeset 6208:c834cfede900

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
precheck: copy merge check from upstream
author Anton Shestakov <av6@dwimlabs.net>
date Sun, 27 Mar 2022 15:04:51 +0300
parents aa9b0d8f268e
children ff6ea5afba0e
files hgext3rd/evolve/rewriteutil.py
diffstat 1 files changed, 3 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/hgext3rd/evolve/rewriteutil.py	Sun Mar 27 15:02:03 2022 +0300
+++ b/hgext3rd/evolve/rewriteutil.py	Sun Mar 27 15:04:51 2022 +0300
@@ -73,6 +73,9 @@
         msg = b"rewriteutil.precheck called with ctx not revs"
         repo.ui.develwarn(msg)
         revs = (r.rev() for r in revs)
+    if len(repo[None].parents()) > 1:
+        raise compat.StateError(_(b"cannot %s changesets while merging")
+                                % action)
     publicrevs = repo.revs(b'%ld and public()', revs)
     if publicrevs:
         summary = _formatrevs(repo, publicrevs)