Mercurial > hg
view tests/test-mactext @ 7566:5f7e3f17aece
mq: drop copy records when refreshing regular patches (issue1441)
Copy information was saved in a common loop, then refined in a git-only block.
The problem was the latter did filter out renames occuring in the current
patch and irrelevant to commit. In the non-git case, copy records still existed
in the dirstate, referencing removed files, making the commit to fail. Git and
non-git copy handling paths are now separated for simplicity.
Reported by Gary Bernhardt
author | Patrick Mezard <pmezard@gmail.com> |
---|---|
date | Sun, 04 Jan 2009 21:32:40 +0100 |
parents | 529d7887ecfe |
children | 6c82beaaa11a |
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 -d'0 0' echo python unix2mac.py f hg ci -m 2 -d'0 0' hg cat f | python print.py cat f | python print.py