comparison mercurial/interfaces/dirstate.py @ 45617:ad984583969a

merge: if DELETED_CHANGED and GET are in actions, choose DELETED_CHANGED ACTION_GET represents that either the file is created on remote or it's newer on the remote side. However, since we have a ACTION_DELETE_CHANGED too, it means the file is not present locally and ACTION_GET is representing that file was created on remote. Having both ACTION_GET and ACTION_DELETED_CHANGED is conflicting because one says that file was created on remote and other says file has delete-changed conflicts. Let's choose ACTION_DELETED_CHANGED which will result in conflicts and make user choose the right way forward.
author Pulkit Goyal <7895pulkit@gmail.com>
date Wed, 30 Sep 2020 15:46:54 +0530
parents be8552f25cab
children 89a2afe31e82
comparison
equal deleted inserted replaced
45616:64461b43a7bf 45617:ad984583969a