Mercurial > hg-stable

diff mercurial/commands.py @ 20791:8dd867bd67e1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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'.
author Mads Kiilerich <madski@unity3d.com>
date Mon, 24 Feb 2014 22:42:14 +0100
parents 49f2d5644f04
children 8c210b169c69
line wrap: on
line diff
--- 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: