Mercurial > hg
view tests/test-fix-clang-format.t @ 39131:02e80e37fbbc
tests: demonstrate that IMM needs to be smarter with path conflicts
When we try to rebase a commit which deletes an existing file and make a
directory of the same name, rebase with IMM aborts. It should work fine just
like the without IMM case.
Differential Revision: https://phab.mercurial-scm.org/D4299
author | Pulkit Goyal <pulkit@yandex-team.ru> |
---|---|
date | Thu, 16 Aug 2018 16:53:48 +0300 |
parents | ded5ea279a93 |
children | 2ecf5c24d0cd |
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:fileset=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 ..