changeset 20875 | cc62c9d6887a |
parent 20791 | 8dd867bd67e1 |
parent 20872 | 3f83fc5cfe71 |
child 21266 | 19d6fec60b81 |
--- a/tests/test-backout.t Tue Apr 01 15:11:19 2014 -0500 +++ b/tests/test-backout.t Tue Apr 01 17:59:06 2014 -0500 @@ -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)