Mercurial > hg
view tests/test-issue5979.t @ 42338:78530404d00b
convert: demonstrate broken {files} list in merge commits with file flags
When there is a merge in which the flags for a file from p2 is
non-empty, `hg convert` will incorrectly include that in the
changeset's files list.
Differential Revision: https://phab.mercurial-scm.org/D6408
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Fri, 17 May 2019 11:32:48 -0700 |
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