##// END OF EJS Templates
graft: do not try to skip rev derived from ancestor more than once (issue6024)...
graft: do not try to skip rev derived from ancestor more than once (issue6024) We check 'x in revs' in other cases, so let's do the same. The test case credits to Tom Prince.

File last commit:

r39743:5abc47d4 default
r40692:3bc2e550 stable
Show More
test-mactext.t
38 lines | 1.0 KiB | text/troff | Tads3Lexer
Matt Mackall
tests: unify test-mactext
r12458
$ cat > unix2mac.py <<EOF
> import sys
>
> for path in sys.argv[1:]:
Pulkit Goyal
py3: replace file() with open() in test-mactext.t...
r36040 > data = open(path, 'rb').read()
> data = data.replace(b'\n', b'\r')
> open(path, 'wb').write(data)
Matt Mackall
tests: unify test-mactext
r12458 > EOF
$ cat > print.py <<EOF
> import sys
> print(sys.stdin.read().replace('\n', '<LF>').replace('\r', '<CR>').replace('\0', '<NUL>'))
> EOF
$ hg init
$ echo '[hooks]' >> .hg/hgrc
$ echo 'pretxncommit.cr = python:hgext.win32text.forbidcr' >> .hg/hgrc
$ echo 'pretxnchangegroup.cr = python:hgext.win32text.forbidcr' >> .hg/hgrc
$ cat .hg/hgrc
[hooks]
pretxncommit.cr = python:hgext.win32text.forbidcr
pretxnchangegroup.cr = python:hgext.win32text.forbidcr
Mads Kiilerich
tests: cleanup of echo statements left over from test conversion
r15243
Matt Mackall
tests: unify test-mactext
r12458 $ echo hello > f
$ hg add f
$ hg ci -m 1
Mads Kiilerich
tests: cleanup of echo statements left over from test conversion
r15243
Matt Harbison
tests: quote PYTHON usage...
r39743 $ "$PYTHON" unix2mac.py f
Matt Mackall
tests: unify test-mactext
r12458 $ hg ci -m 2
Martin Geisler
win32text: lowercase warning message
r16932 attempt to commit or push text file(s) using CR line endings
Matt Mackall
tests: unify test-mactext
r12458 in dea860dc51ec: f
transaction abort!
rollback completed
abort: pretxncommit.cr hook failed
[255]
Matt Harbison
tests: quote PYTHON usage...
r39743 $ hg cat f | "$PYTHON" print.py
Matt Mackall
tests: unify test-mactext
r12458 hello<LF>
Matt Harbison
tests: quote PYTHON usage...
r39743 $ cat f | "$PYTHON" print.py
Matt Mackall
tests: unify test-mactext
r12458 hello<CR>