Mercurial > hg > evolve
changeset 3855:85ad555d6ff7
tests: rename test-evolve-abort.t to test-evolve-abort-orphan.t
We renamed the test file because it contains all the cases related to orphan
resolution. Now we care about divergence resolution too and hence we must have
separate specific test files for each type.
| author | Pulkit Goyal <7895pulkit@gmail.com> |
|---|---|
| date | Wed, 23 May 2018 01:27:13 +0530 |
| parents | 44542ac10170 |
| children | 6878d708500a |
| files | tests/test-evolve-abort-orphan.t tests/test-evolve-abort.t |
| diffstat | 1 files changed, 8 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
rename from tests/test-evolve-abort.t rename to tests/test-evolve-abort-orphan.t --- a/tests/test-evolve-abort.t +++ b/tests/test-evolve-abort-orphan.t @@ -1,5 +1,11 @@ -Tests for the --abort flag for `hg evolve` command -================================================== +Tests for the --abort flag for `hg evolve` command while orphan resolution +========================================================================== + +The `--abort` flag aborts the interrupted evolve by undoing all the work which +was done during resolution i.e. stripping new changesets created, moving +bookmarks back, moving working directory back. + +This test contains cases when `hg evolve` is doing orphan resolution. Setup =====