# HG changeset patch
# User Anton Shestakov <av6@dwimlabs.net>
# Date 1648382691 -10800
# Node ID c834cfede900575f5626919d725b89ff273fcf6c
# Parent  aa9b0d8f268e8696e335e33be18ba16d3a6afdd6
precheck: copy merge check from upstream

diff -r aa9b0d8f268e -r c834cfede900 hgext3rd/evolve/rewriteutil.py
--- 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)