##// 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:

r37864:b4b7427b default
r38817:bb54db4a @96 default
Show More
test-bad-pull.t
15 lines | 314 B | text/troff | Tads3Lexer
Gregory Szorc
tests: remove #require killdaemons...
r37864 #require serve
Mads Kiilerich
tests: use 'hghave serve' to guard tests that requires serve daemon management
r15446
Adrian Buehlmann
test-bad-pull: partially adjust for Windows...
r17019 $ hg clone http://localhost:$HGPORT/ copy
abort: * (glob)
[255]
Martin Geisler
tests: unify test-bad-pull
r11859
Mads Kiilerich
tests: remove hacks for testing if file or directory exists
r15515 $ test -d copy
[1]
Martin Geisler
tests: unify test-bad-pull
r11859
Augie Fackler
cleanup: use $PYTHON to run python in many more tests...
r32940 $ $PYTHON "$TESTDIR/dumbhttp.py" -p $HGPORT --pid dumb.pid
Mike Hommey
tests: pull common http server setup out of individual tests...
r22959 $ cat dumb.pid >> $DAEMON_PIDS
Matt Mackall
tests: fix shutdown race in test-bad-pull
r16334 $ hg clone http://localhost:$HGPORT/foo copy2
abort: HTTP Error 404: * (glob)
[255]
Matt Mackall
tests: drop DAEMON_PIDS from killdaemons calls
r25474 $ killdaemons.py