HomePhabricator

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

Description

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().

Details

Committed
Greg Ward <greg-hg@gerg.ca>Feb 15 2010, 3:25 PM
Parents
rHGd2c1fc440533: test-merge-default: make content of test repo clearer.
Branches
Unknown
Tags
Unknown