Mercurial > hg
view tests/test-revlog-packentry.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 | d4e62df1c73d |
children | ccd76e292be5 |
line wrap: on
line source
$ hg init repo $ cd repo $ touch foo $ hg ci -Am 'add foo' adding foo $ hg up -C null 0 files updated, 0 files merged, 1 files removed, 0 files unresolved this should be stored as a delta against rev 0 $ echo foo bar baz > foo $ hg ci -Am 'add foo again' adding foo created new head $ hg debugindex foo rev linkrev nodeid p1 p2 0 0 b80de5d13875 000000000000 000000000000 1 1 0376abec49b8 000000000000 000000000000 $ cd ..