Mercurial > evolve
changeset 3783:313484606461 stable
tests: add tests for conflicts while respecting commands.update.check
This patch adds tests to check that we don't run into conflicts while respecting
commands.update.check.
The error message now does not show the hint about --merge option which we
should fix.
| author | Pulkit Goyal <7895pulkit@gmail.com> |
|---|---|
| date | Sun, 03 Jun 2018 03:13:47 +0530 |
| parents | 27cf636b2f4d |
| children | 838fc71ddb9c |
| files | tests/test-prev-next.t |
| diffstat | 1 files changed, 20 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test-prev-next.t Sun Jun 03 02:37:13 2018 +0530 +++ b/tests/test-prev-next.t Sun Jun 03 03:13:47 2018 +0530 @@ -419,3 +419,23 @@ @@ -1,1 +1,1 @@ -hi +bar + +test that we dont end up in merge conflicts + + $ echo bar > bar + $ hg prev + abort: conflicting changes + (commit or update --clean to discard changes) + [255] + + $ echo hi > bar + $ hg prev + 0 files updated, 0 files merged, 1 files removed, 0 files unresolved + [1] added foo + $ echo bar > bar + $ hg add bar + + $ hg next + abort: conflicting changes + (commit or update --clean to discard changes) + [255]