flags: add a test for merging exec flag change with rename and file change
Changing the file activate other code path that also have bugs… There are two
distinct bugs depending of which side of the merge you stand on. They both
leading to exec flag loss.
We add tests for both, the fix are coming in later changesets.
Differential Revision: https://phab.mercurial-scm.org/D8532
$ 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