##// END OF EJS Templates
histedit: make check for unresolved conflicts explicit (issue5545)...
histedit: make check for unresolved conflicts explicit (issue5545) Previously, we'd rely on the implicit check that `localrepo.commit` did. The problem is that that check only happened when the working copy was dirty. With a "clean" working copy but unresolved conflicts we'd get into a broken state. To fix that, do what rebase does and check for unresolved conflicts at the start of histedit --continue.

File last commit:

r29515:bd18c217 default
r32057:e5ffc91a stable
Show More
test-check-shbang.t
14 lines | 362 B | text/troff | Tads3Lexer
/ tests / test-check-shbang.t
timeless
tests: add new test for #! shebang lines...
r28879 #require test-repo
timeless
tests: silence test-repo obsolete warning...
r29219 $ . "$TESTDIR/helpers-testrepo.sh"
timeless
tests: add new test for #! shebang lines...
r28879 $ cd "`dirname "$TESTDIR"`"
look for python scripts that do not use /usr/bin/env
Augie Fackler
test-check-shbang: work around check-code not wanting hardcoded paths...
r29515 $ hg files 'set:grep(r"^#!.*?python") and not grep(r"^#!/usr/bi{1}n/env python")'
timeless
tests: add new test for #! shebang lines...
r28879 [1]
look for shell scripts that do not use /bin/sh
Augie Fackler
test-check-shbang: work around check-code not wanting hardcoded paths...
r29515 $ hg files 'set:grep(r"^#!.*/bi{1}n/sh") and not grep(r"^#!/bi{1}n/sh")'
timeless
tests: add new test for #! shebang lines...
r28879 [1]