Arne Babenhauserheide committed 7eaad11

raise util.Abort instead of assertion when trying to evolve a merge changeset.

This prevent exposing a nasty traceback to the user.

  • Participants
  • Parent commits 0961a7e
  • Branches default

Comments (0)

Files changed (1)

         rebase = extensions.find('rebase')
         # dummy state to trick rebase node
-        assert orig.p2().rev() == node.nullrev, 'no support yet'
+        if not orig.p2().rev() == node.nullrev:
+            raise util.Abort(
+                'no support for evolution merge changesets yet',
+                hint="Redo the merge a use `hg prune` to obsolete the old one")
         destbookmarks = repo.nodebookmarks(dest.node())
         cmdutil.duplicatecopies(repo, orig.node(), dest.node())
         nodesrc = orig.node()