Arne Babenhauserheide committed 41c5a2a

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

  • Participants
  • Parent commits d5738ed
  • Branches stable

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 relocating merge changesets yet')
         destbookmarks = repo.nodebookmarks(dest.node())
         cmdutil.duplicatecopies(repo, orig.node(), dest.node())
         nodesrc = orig.node()