discovery: avoid wrong detection of multiple branch heads (
issue6256)
This fix the code using obsolescence markers to remove "to be obsoleted" heads
during the detection of new head creation from push. The code turned out to not
use the branch information at all. This lead changeset from different branch to
be detected as new head on unrelated branch.
The code fix is actually quite simple. New tests have been added to covers
these cases.
Differential Revision: https://phab.mercurial-scm.org/D8259
$ hg init r1
$ cd r1
$ hg ci --config ui.allowemptycommit=true -m c0
$ hg ci --config ui.allowemptycommit=true -m c1
$ hg ci --config ui.allowemptycommit=true -m c2
$ hg co -q 0
$ hg ci --config ui.allowemptycommit=true -m c3
created new head
$ hg co -q 3
$ hg merge --quiet
$ hg ci --config ui.allowemptycommit=true -m c4
$ hg log -G -T'{desc}'
@ c4
|\
| o c3
| |
o | c2
| |
o | c1
|/
o c0
>>> from mercurial import hg
>>> from mercurial import ui as uimod
>>> repo = hg.repository(uimod.ui())
>>> for anc in repo.changelog.ancestors([4], inclusive=True):
... print(anc)
4
3
2
1
0