[issue2640] hgeol doesn't work correctly with mq patches that add new files
Colin Caughie
bugs at mercurial.selenic.com
Sun Feb 13 13:35:44 UTC 2011
New submission from Colin Caughie <c.caughie at indigovision.com>:
The eol extension always sets the patch.eol option to "auto" when it is
enabled. This works fine for patches that only modify existing files (since
it picks up the eol convention from the original version of the file), but
when applying a patch that adds a new file, the new file always ends up with
LF line endings even if the rules in .hgeol specify CRLF endings in the
working copy.
This can cause some nasty behaviour when using qref; several times in the
past few days I've done something like the following:
> hg qpop
...
> hg qpush
*edit file added by the pushed patch*
> hg qref
refresh interrupted while patch was popped! (revert --all, qpush to recover)
abort: inconsistent newline style in test2.txt
...and I've found an aborted qref is not the easiest thing to recover from.
Ideally patch would use the pattern rules in .hgeol when creating new files
(and possibly even when modifying existing ones).
----------
messages: 15235
nosy: ccaughie
priority: bug
status: unread
title: hgeol doesn't work correctly with mq patches that add new files
____________________________________________________
Mercurial issue tracker <bugs at mercurial.selenic.com>
<http://mercurial.selenic.com/bts/issue2640>
____________________________________________________
More information about the Mercurial-devel
mailing list