Mercurial > hg
view tests/test-issue5979.t @ 47916:65e3d8028f2e
dirstate: drop the `_merge` method
It only has one caller that only use one of the branch, so lets inline that
branch and clean things up further.
Differential Revision: https://phab.mercurial-scm.org/D11351
author | Pierre-Yves David <pierre-yves.david@octobus.net> |
---|---|
date | Tue, 24 Aug 2021 21:16:48 +0200 |
parents | ef6cab7930b3 |
children |
line wrap: on
line source
$ 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