Mercurial > hg
view tests/test-dirstate-backup.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 | c2b30348930f |
children | 8d72e29ad1e0 |
line wrap: on
line source
Set up $ hg init repo $ cd repo Try to import an empty patch $ hg import --no-commit - <<EOF > EOF applying patch from stdin abort: stdin: no diffs found [255] No dirstate backups are left behind $ ls .hg/dirstate* | sort .hg/dirstate