Mercurial > hg
comparison tests/test-transplant @ 8811:8b35b08724eb
Make mq, record and transplant honor patch.eol
author | Patrick Mezard <pmezard@gmail.com> |
---|---|
date | Mon, 15 Jun 2009 00:03:27 +0200 |
parents | 3f4f14eab085 |
children | eba6c8687fd2 |
comparison
equal
deleted
inserted
replaced
8810:ac92775b3b80 | 8811:8b35b08724eb |
---|---|
132 EOF | 132 EOF |
133 chmod +x test-filter | 133 chmod +x test-filter |
134 hg transplant -s ../t -b tip -a --filter ./test-filter |\ | 134 hg transplant -s ../t -b tip -a --filter ./test-filter |\ |
135 sed 's/filtering.*/filtering/g' | 135 sed 's/filtering.*/filtering/g' |
136 hg log --template '{rev} {parents} {desc}\n' | 136 hg log --template '{rev} {parents} {desc}\n' |
137 cd .. | |
138 | |
139 echo '% test with a win32ext like setup (differing EOLs)' | |
140 hg init twin1 | |
141 cd twin1 | |
142 echo a > a | |
143 echo b > b | |
144 echo b >> b | |
145 hg ci -Am t | |
146 echo a > b | |
147 echo b >> b | |
148 hg ci -m changeb | |
149 cd .. | |
150 | |
151 hg init twin2 | |
152 cd twin2 | |
153 echo '[patch]' >> .hg/hgrc | |
154 echo 'eol = crlf' >> .hg/hgrc | |
155 python -c "file('b', 'wb').write('b\r\nb\r\n')" | |
156 hg ci -m addb | |
157 hg transplant -s ../twin1 tip | |
158 python -c "print repr(file('b', 'rb').read())" | |
159 cd .. |