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().
test-merge-default: make content of test repo clearer.
Makes it easier to understand and modify the test.
(
issue2043).
import: if in doubt, consume stream until start of diff
This prevents a header-like line in the message body from causing a spurious split.
bdiff: do not use recursion / avoid stackoverflow (
issue1940)