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 repo
$ cd repo
$ touch a.html b.html c.py d.py
$ cat > frontend.sparse << EOF
> [include]
> *.html
> EOF
$ hg -q commit -A -m initial
$ echo 1 > a.html
$ echo 1 > c.py
$ hg commit -m 'commit 1'
Enable sparse profile
$ cat .hg/requires
dotencode
fncache
generaldelta
revlogv1
sparserevlog
store
testonly-simplestore (reposimplestore !)
$ hg debugsparse --config extensions.sparse= --enable-profile frontend.sparse
$ ls -A
.hg
a.html
b.html
Requirement for sparse added when sparse is enabled
$ cat .hg/requires
dotencode
exp-sparse
fncache
generaldelta
revlogv1
sparserevlog
store
testonly-simplestore (reposimplestore !)
Client without sparse enabled reacts properly
$ hg files
abort: repository is using sparse feature but sparse is not enabled; enable the "sparse" extensions to access!
[255]
Requirement for sparse is removed when sparse is disabled
$ hg debugsparse --reset --config extensions.sparse=
$ cat .hg/requires
dotencode
fncache
generaldelta
revlogv1
sparserevlog
store
testonly-simplestore (reposimplestore !)
And client without sparse can access
$ hg files
a.html
b.html
c.py
d.py
frontend.sparse