# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@octobus.net>
# Date 2021-07-18 20:45:18
# Node ID 8c73818c67dd924013069494dc1e0ba27fa18ce4
# Parent  f51aaa0f148537dd81b7bf0594fa7dba02972b47

mq: drop the use of `dirstate.merged`

Since mq does not work on merge, we do not need this.

Differential Revision: https://phab.mercurial-scm.org/D11185

diff --git a/hgext/mq.py b/hgext/mq.py
--- a/hgext/mq.py
+++ b/hgext/mq.py
@@ -1090,18 +1090,9 @@ class queue(object):
 
             if merge and files:
                 # Mark as removed/merged and update dirstate parent info
-                removed = []
-                merged = []
-                for f in files:
-                    if os.path.lexists(repo.wjoin(f)):
-                        merged.append(f)
-                    else:
-                        removed.append(f)
                 with repo.dirstate.parentchange():
-                    for f in removed:
+                    for f in files:
                         repo.dirstate.update_file_p1(f, p1_tracked=True)
-                    for f in merged:
-                        repo.dirstate.merge(f)
                     p1 = repo.dirstate.p1()
                     repo.setparents(p1, merge)