##// END OF EJS Templates
resolve: add option to warn/abort on -m with unresolved conflict markers...
resolve: add option to warn/abort on -m with unresolved conflict markers When a user is dropped out of Mercurial to a terminal to resolve files, we emit messages like: conflicts while merging file1! (edit, then use 'hg resolve --mark') conflicts while merging file2! (edit, then use 'hg resolve --mark') We don't mention a file name in the hint, so some users might do something like `$EDITOR file1; hg resolve --mark`, see that it says "(no more unresolved files)" and forget to deal with file2 before running the next command. Even if we did mention a file name in the hint, it's too easy to forget it (maybe the merge spans a couple days or something). This option lets us inform the user that they might have missed something. In the scenario above, the output would be something like: warning: the following files still have conflict markers: file2 (no more unresolved files) Differential Revision: https://phab.mercurial-scm.org/D4035

File last commit:

r38206:6ae62d62 stable
r38817:bb54db4a @96 default
Show More
test-check-pylint.t
22 lines | 616 B | text/troff | Tads3Lexer
/ tests / test-check-pylint.t
Pierre-Yves David
test: add a basic 'test-check-pylint.t'...
r31413 #require test-repo pylint hg10
Run pylint for known rules we care about.
-----------------------------------------
There should be no recorded failures; fix the codebase before introducing a
new check.
Current checks:
- W0102: no mutable default argument
$ touch $TESTTMP/fakerc
$ pylint --rcfile=$TESTTMP/fakerc --disable=all \
Boris Feld
pylint: add a check for multiple statement on a single line...
r35648 > --enable=W0102,C0321 \
Boris Feld
pylint: split command line argument on multiple lines...
r35645 > --reports=no \
Siddharth Agarwal
tests: disable lints on mercurial/thirdparty...
r34396 > --ignore=thirdparty \
Matt Harbison
tests: adapt test-check-pylint to run on Windows...
r38206 > mercurial hgdemandimport hgext hgext3rd | sed 's/\r$//'
Using config file *fakerc (glob) (?)
Jun Wu
test-check-pylint: match its output...
r31839 (?)
------------------------------------ (?)
Your code has been rated at 10.00/10 (?)
(?)