merge: store ACTION_KEEP_ABSENT when we are keeping the file absent locally
If a file is not present on the local side, and it's unchanged between other
merge parent and ancestor, we don't use any action, neither we had a if-else
branch for that condition. This leads to bid-merge missing that there is a
such action possible which can be performed.
As test changes demonstrate, we now choose the locally deleted side instead
of choosing the remote one consistently. This is also wrong behavior which is
resulted because of missing possible action. It will be fixed in next patch.
This whole logic is not acurrate as we should prompt user on what to do
when this kind of criss-cross merge is in play.
Differential Revision: https://phab.mercurial-scm.org/D8940
$ hg init a
$ cd a
$ echo 123 > a
$ hg add a
$ hg commit -m "a" -u a
$ cd ..
$ hg init b
$ cd b
$ echo 321 > b
$ hg add b
$ hg commit -m "b" -u b
$ hg pull ../a
pulling from ../a
searching for changes
abort: repository is unrelated
[255]
$ hg pull -f ../a
pulling from ../a
searching for changes
warning: repository is unrelated
requesting all changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
new changesets 9a79c33a9db3
(run 'hg heads' to see heads, 'hg merge' to merge)
$ hg heads
changeset: 1:9a79c33a9db3
tag: tip
parent: -1:000000000000
user: a
date: Thu Jan 01 00:00:00 1970 +0000
summary: a
changeset: 0:01f8062b2de5
user: b
date: Thu Jan 01 00:00:00 1970 +0000
summary: b
$ cd ..