Mercurial > hg-stable
view tests/test-mactext @ 10135:9a4034b630c4 stable
patch: better handling of sequence of offset patch hunks (issue1941)
The built-in patch implementation applied the hunks to the wrong lines of the
file if the file in the repo has been modified to skew the patch line numbers
and the file contains repetitive sequences of lines.
author | Greg Onufer <gonufer@jazzhaiku.com> |
---|---|
date | Wed, 09 Dec 2009 16:56:00 -0800 |
parents | 6c82beaaa11a |
children |
line wrap: on
line source
#!/bin/sh cat > unix2mac.py <<EOF import sys for path in sys.argv[1:]: data = file(path, 'rb').read() data = data.replace('\n', '\r') file(path, 'wb').write(data) 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 echo echo hello > f hg add f hg ci -m 1 echo python unix2mac.py f hg ci -m 2 hg cat f | python print.py cat f | python print.py