Mercurial > hg-stable

diff tests/test-backout.t @ 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 ba619c50a355
children cc62c9d6887a
line wrap: on
line diff
--- 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