comparison i18n/polib.LICENSE @ 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 181936ec9bfb
children
comparison
equal deleted inserted replaced
42578:9f73620a65fe 42579:b8d54f4625cb