Mercurial > hg
diff relnotes/next @ 42579:b8d54f4625cb
merge: disallow merge abort in case of an unfinished operation (issue6160)
This patch disallows `hg merge --abort` in case an operation of higher
precedence i.e unshelve, rebase, histedit are in unfinished states.
This is done so as to avoid partial abort of these operations in case
merge abort is called at an interrupted step.
The patch adds a `cmdutil.getunfinishedstate` function which checks
for operations under progress and returns a `statecheck` object for it.
Differential Revision: https://phab.mercurial-scm.org/D6607
author | Taapas Agrawal <taapas2897@gmail.com> |
---|---|
date | Tue, 09 Jul 2019 12:58:29 +0300 |
parents | 9f73620a65fe |
children | cba59b338976 |
line wrap: on
line diff
--- a/relnotes/next Mon Jul 08 15:01:18 2019 -0700 +++ b/relnotes/next Tue Jul 09 12:58:29 2019 +0300 @@ -81,6 +81,10 @@ * `cmdutil.checkunfinished()` now includes detection for merge too. + * merge abort has been disallowed in case an operation of higher + precedence is in progress to avoid cases of partial abort of + operations. + * We used to automatically attempt to make extensions compatible with Python 3 (by translating their source code while loading it). We no longer do that.