Mercurial > hg
view tests/test-fix-clang-format.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 | 2ecf5c24d0cd |
children |
line wrap: on
line source
#require clang-format Test that a simple "hg fix" configuration for clang-format works. $ cat >> $HGRCPATH <<EOF > [extensions] > fix = > [experimental] > evolution.createmarkers=True > evolution.allowunstable=True > [fix] > clang-format:command=clang-format --style=Google --assume-filename={rootpath} > clang-format:linerange=--lines={first}:{last} > clang-format:pattern=set:**.cpp or **.hpp > EOF $ hg init repo $ cd repo $ printf "void foo(){int x=2;}\n" > foo.cpp $ printf "void\nfoo();\n" > foo.hpp $ hg commit -Am "foo commit" adding foo.cpp adding foo.hpp $ hg cat -r tip * void foo(){int x=2;} void foo(); $ hg fix -r tip $ hg cat -r tip * void foo() { int x = 2; } void foo(); $ cd ..