Mercurial > hg
view tests/test-parseindex.out @ 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().
author | Greg Ward <greg-hg@gerg.ca> |
---|---|
date | Mon, 15 Feb 2010 15:25:29 -0500 |
parents | 6563438219e3 |
children | 4c94b6d0fb1c |
line wrap: on
line source
changeset: 0:9c2cf2b35aa7 user: test date: Mon Jan 12 13:46:40 1970 +0000 summary: add foo changeset: 1:3756a9556b89 tag: tip user: test date: Mon Jan 12 13:46:41 1970 +0000 summary: change foo 2 revisions: 9c2cf2b35aa7 3756a9556b89