branch | stable |
changeset 20872 | 3f83fc5cfe71 |
parent 20594 | ba619c50a355 |
child 20875 | cc62c9d6887a |
--- a/tests/test-backout.t Sat Mar 08 18:41:56 2014 +0900 +++ b/tests/test-backout.t Sat Mar 08 18:52:16 2014 +0900 @@ -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)