# HG changeset patch
# User Mads Kiilerich <madski@unity3d.com>
# Date 1393278134 -3600
# Node ID 8dd867bd67e19d44a945d785b9092a9dbedb7849
# Parent  49f2d5644f04c6675d9d2e08eceaffd9c1ff2f38
backout: improve confusing 'cannot backout change on a different branch' abort

These days 'branch' usually refer to a named branch.

Instead, abort with 'cannot backout change that not is an ancestor'.

diff -r 49f2d5644f04 -r 8dd867bd67e1 mercurial/commands.py
--- a/mercurial/commands.py	Wed Mar 19 02:45:14 2014 +0100
+++ b/mercurial/commands.py	Mon Feb 24 22:42:14 2014 +0100
@@ -439,7 +439,7 @@
     op1, op2 = repo.dirstate.parents()
     a = repo.changelog.ancestor(op1, node)
     if a != node:
-        raise util.Abort(_('cannot backout change on a different branch'))
+        raise util.Abort(_('cannot backout change that is not an ancestor'))
 
     p1, p2 = repo.changelog.parents(node)
     if p1 == nullid:
diff -r 49f2d5644f04 -r 8dd867bd67e1 tests/test-backout.t
--- a/tests/test-backout.t	Wed Mar 19 02:45:14 2014 +0100
+++ b/tests/test-backout.t	Mon Feb 24 22:42:14 2014 +0100
@@ -92,7 +92,7 @@
 should fail
 
   $ hg backout 1
-  abort: cannot backout change on a different branch
+  abort: cannot backout change that is not an ancestor
   [255]
   $ echo c > c
   $ hg ci -Am2
@@ -108,7 +108,7 @@
 should fail
 
   $ hg backout 1
-  abort: cannot backout change on a different branch
+  abort: cannot backout change that is not an ancestor
   [255]
   $ hg summary
   parent: 2:db815d6d32e6 tip