Mercurial > evolve
annotate tests/test-check-pyflakes.t @ 5513:a8c21707e9c4
evolve: add test to show broken --continue case of content divergence
This test case demonstrates that during the resolution of content
divergence which includes relocation of "divergent" side but not
"other" and results in merge conflict during relocation, we can
lose some changes.
Next patch will fix this bug.
author | Sushil khanchi <sushilkhanchi97@gmail.com> |
---|---|
date | Wed, 05 Aug 2020 00:16:26 +0530 |
parents | f354de498737 |
children | 0e397aeee55b |
rev | line source |
---|---|
1930 | 1 #require test-repo pyflakes |
2 | |
3 Copied from Mercurial core (60ee2593a270) | |
4 | |
5 $ cd "`dirname "$TESTDIR"`" | |
6 | |
7 run pyflakes on all tracked files ending in .py or without a file ending | |
8 (skipping binary file random-seed) | |
9 | |
5336
2895b026ba88
tests: modernize test-check-pyflakes.t
Anton Shestakov <av6@dwimlabs.net>
parents:
4333
diff
changeset
|
10 $ hg files -0 'set:(**.py or grep("^#!.*python")) - removed()' \ |
2895b026ba88
tests: modernize test-check-pyflakes.t
Anton Shestakov <av6@dwimlabs.net>
parents:
4333
diff
changeset
|
11 > -X hgext3rd/evolve/thirdparty \ |
2895b026ba88
tests: modernize test-check-pyflakes.t
Anton Shestakov <av6@dwimlabs.net>
parents:
4333
diff
changeset
|
12 > 2>/dev/null \ |
5337
f354de498737
tests: actually use the correct python version for flake8/pyflakes
Anton Shestakov <av6@dwimlabs.net>
parents:
5336
diff
changeset
|
13 > | xargs -0 "$PYTHON" -m pyflakes 2>/dev/null |