Mercurial > hg
diff tests/test-merge-default.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 | d2c1fc440533 |
| children | 5b48d819d5f9 |
line wrap: on
line diff
--- a/tests/test-merge-default.out Mon Feb 15 15:07:21 2010 -0500 +++ b/tests/test-merge-default.out Mon Feb 15 15:25:29 2010 -0500 @@ -34,3 +34,8 @@ % should fail because merge with other branch abort: branch 'foobranch' has one head - please merge with an explicit rev (run 'hg heads' to see all heads) +% merge preview not affected by common ancestor +2:2d95304fed5d +4:f25cbe84d8b3 +5:a431fabd6039 +6:e88e33f3bf62