Mercurial > hg
comparison 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 |
comparison
equal
deleted
inserted
replaced
10504:d2c1fc440533 | 10505:b3311e26f94f |
---|---|
32 marked working directory as branch foobranch | 32 marked working directory as branch foobranch |
33 created new head | 33 created new head |
34 % should fail because merge with other branch | 34 % should fail because merge with other branch |
35 abort: branch 'foobranch' has one head - please merge with an explicit rev | 35 abort: branch 'foobranch' has one head - please merge with an explicit rev |
36 (run 'hg heads' to see all heads) | 36 (run 'hg heads' to see all heads) |
37 % merge preview not affected by common ancestor | |
38 2:2d95304fed5d | |
39 4:f25cbe84d8b3 | |
40 5:a431fabd6039 | |
41 6:e88e33f3bf62 |