Mercurial > hg
diff tests/test-shelve2.t @ 42600:3bc400ccbf99
abort: added support for merge
This adds support of `hg merge --abort` to `hg abort` plan.
This involves refactoring `hg.merge` into two different
functions removing the abort logic of `merge` from `hg.merge`
and then creating a seperate `hg.abortmerge` to handle the
abort logic so that the abortion of merge can be called
independently.
`hg.abortmerge` is then registered as `abortfunc` for the
state detection API so that `commands.abort` can use it to
deal with an unfinished merge operation.
Results are shown as tests.
Differential Revision: https://phab.mercurial-scm.org/D6588
author | Taapas Agrawal <taapas2897@gmail.com> |
---|---|
date | Sun, 30 Jun 2019 01:07:14 +0530 |
parents | 3fb0493812c0 |
children | 117437f3f541 |
line wrap: on
line diff
--- a/tests/test-shelve2.t Wed Jun 26 22:15:07 2019 +0530 +++ b/tests/test-shelve2.t Sun Jun 30 01:07:14 2019 +0530 @@ -718,11 +718,16 @@ Unshelve --abort fails with appropriate message if there's no unshelve in progress + +#if abortflag + $ hg unshelve --abort + abort: no unshelve in progress + [255] +#else $ hg abort - abort: no unshelve in progress (abortflag !) - abort: merge in progress but does not support 'hg abort' (no-abortflag !) - (use 'hg commit' or 'hg merge --abort') (no-abortflag !) - [255] + aborting the merge, updating back to 9451eaa6eee3 + 1 files updated, 0 files merged, 0 files removed, 0 files unresolved +#endif $ cd .. Unshelve respects --keep even if user intervention is needed