# HG changeset patch
# User Olle Lundberg <geek@nerd.sh>
# Date 1395790694 -3600
# Node ID 7de15cfd79f70b171ba30ddb17d19624e5ca83ff
# Parent  e0eb4899b7c26cc5f330d554f57b52d5644a11f6
evolve: abort when trying to move a node on top of itself

This provides a clearer error message when evolve misstakenly tries
to move a changeset on top of itself. Before we got an abort with a
cryptic message about trying to rebase a merge changeset.

A proper fix to make sure that evolve never tries to move a node on
top of itself will come in later patches.

diff -r e0eb4899b7c2 -r 7de15cfd79f7 hgext/evolve.py
--- a/hgext/evolve.py	Wed Mar 26 23:57:15 2014 +0100
+++ b/hgext/evolve.py	Wed Mar 26 00:38:14 2014 +0100
@@ -794,6 +794,12 @@
 def relocate(repo, orig, dest):
     """rewrite <rev> on dest"""
     try:
+        if orig.rev() == dest.rev():
+            raise util.Abort(_('tried to relocade a node on top of itself'),
+                             hint=_("This shouldn't happen. If you still "
+                                    "need to move changesets, please do so "
+                                    "manually with nothing to rebase - working directory parent is also destination"))
+
         rebase = extensions.find('rebase')
         # dummy state to trick rebase node
         if not orig.p2().rev() == node.nullrev: