Mercurial > hg
view tests/test-mq-qpush-fail.out @ 5483:ec2cc1dadbf7
Handle patches with misformatted empty lines
Insert a space on empty lines which are missing a control character.
Signed-off-by: Hollis Blanchard <hollisb@us.ibm.com>
---
I frequently receive emailed patches with empty lines represented as "\n\n",
where Mercurial expects them to be "\n \n". patch(1) applies these patches
without complaint, but qpush fails all hunks.
author | Hollis Blanchard <hollisb@us.ibm.com> |
---|---|
date | Thu, 01 Nov 2007 17:15:50 -0500 |
parents | 17f5d2069551 |
children | c2a21fe60994 |
line wrap: on
line source
adding foo Patch queue now empty applying patch1 applying patch2 applying bad-patch transaction abort! rollback completed cleaning up working directory...done abort: decoding near 'é': 'ascii' codec can't decode byte 0xe9 in position 0: ordinal not in range(128)! changeset: 0:bbd179dfa0a7 tag: tip user: test date: Thu Jan 01 00:00:00 1970 +0000 summary: add foo % bar should be gone; other unknown/ignored files should still be around ? untracked-file I .hgignore C foo