Mercurial > hg
view tests/test-issue5979.t @ 44331:2527c10a2569 stable
shelve: add test clearly demonstrating that the conflict labels are backwards
Differential Revision: https://phab.mercurial-scm.org/D8139
author | Kyle Lippincott <spectral@google.com> |
---|---|
date | Thu, 20 Feb 2020 17:06:01 -0800 |
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