Mercurial > public > mercurial-scm > hg-stable

diff mercurial/mergestate.py @ 48724:b0aa9b0b9c21

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
convert: use the merge action constant The constant exists, lets use them. Otherwise we cannot make these constant more powerful. Differential Revision: https://phab.mercurial-scm.org/D12113
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Fri, 28 Jan 2022 16:25:41 +0100
parents 608a35db186c
children 9bc86adf32f6
line wrap: on
line diff
--- a/mercurial/mergestate.py	Fri Jan 28 16:11:42 2022 +0100
+++ b/mercurial/mergestate.py	Fri Jan 28 16:25:41 2022 +0100
@@ -129,6 +129,15 @@
     ACTION_KEEP_NEW,
 )
 
+# Used by concert to detect situation it does not like, not sure what the exact
+# criteria is
+CONVERT_MERGE_ACTIONS = (
+    ACTION_MERGE,
+    ACTION_DIR_RENAME_MOVE_LOCAL,
+    ACTION_CHANGED_DELETED,
+    ACTION_DELETED_CHANGED,
+)
+
 
 class _mergestate_base(object):
     """track 3-way merge state of individual files