view tests/test-dirstate-future @ 10505:b3311e26f94f stable

merge: fix --preview to show all nodes that will be merged (issue2043).

Formerly, it omitted nodes that were not descendants of the least
common ancestor of the two merge parents, even though those nodes
contribute to the merge.  The new algorithm uses revlog.findmissing()
instead of ancestor() + nodesbetween().

#!/bin/sh

hg init
echo a > a
hg add
hg ci -m1

# set mtime of a into the future
touch -t 202101011200 a

# status must not set a's entry to unset (issue1790)
hg status
hg debugstate