Mercurial > hg > mercurial-source

diff tests/test-backout.t @ 20872:3f83fc5cfe71 stable 2.9.2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
backout: correct commit status of no changes made (BC) (issue4190) If backout generated no changes to commit, it showed wrong status, "changeset <target> backs out changeset <target>", and raised TypeError with -v option. This changes the return code to 1, which is the same as "hg commit" and "hg rebase".
author Yuya Nishihara <yuya@tcha.org>
date Sat, 08 Mar 2014 18:52:16 +0900
parents ba619c50a355
children cc62c9d6887a
line wrap: on
line diff
--- a/tests/test-backout.t
+++ b/tests/test-backout.t
@@ -409,6 +409,22 @@
 
   $ cd ..
 
+backout of empty changeset (issue4190)
+
+  $ hg init emptycommit
+  $ cd emptycommit
+
+  $ touch file1
+  $ hg ci -Aqm file1
+  $ hg branch -q branch1
+  $ hg ci -qm branch1
+  $ hg backout -v 1
+  resolving manifests
+  nothing changed
+  [1]
+
+  $ cd ..
+
 
 Test usage of `hg resolve` in case of conflict
 (issue4163)