hg-stable: tests/test-config-env.py.out@ad984583969a (annotated)

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.

31690 d83e51654c8a rcutil: let environ override system configs (BC) Jun Wu <quark@fb.com> parents: diff changeset	1	pager.pager=p0 # $TESTTMP/sysrc:4
d83e51654c8a rcutil: let environ override system configs (BC) Jun Wu <quark@fb.com> parents: diff changeset	2	ui.editor=e1 # $TESTTMP/userrc:2
d83e51654c8a rcutil: let environ override system configs (BC) Jun Wu <quark@fb.com> parents: diff changeset	3
d83e51654c8a rcutil: let environ override system configs (BC) Jun Wu <quark@fb.com> parents: diff changeset	4	pager.pager=p2 # $PAGER
d83e51654c8a rcutil: let environ override system configs (BC) Jun Wu <quark@fb.com> parents: diff changeset	5	ui.editor=e1 # $TESTTMP/userrc:2
d83e51654c8a rcutil: let environ override system configs (BC) Jun Wu <quark@fb.com> parents: diff changeset	6

author	Pulkit Goyal <7895pulkit@gmail.com>
	Wed, 30 Sep 2020 15:46:54 +0530
changeset 45620	ad984583969a
parent 31690	d83e51654c8a
permissions	-rw-r--r--