[darcs-users] Bug: More line-ending misery

David Roundy droundy at abridgegame.org
Sat Nov 27 16:34:17 UTC 2004

On Fri, Nov 26, 2004 at 01:32:54PM +0000, Jamie Webb wrote:
> I've just had a conflict in a DOS-format file, on my Linux system, and
> Darcs has inserted Unix line-endings for the conflict markers,
> creating a mixed-format file. This is potentially quite bad because
> some (broken, IMHO, but nevertheless popular) editors get a little
> confused by these files and do things like converting the line-endings
> thoughout the file. That in turn causes Darcs to do its famous
> spinning-forever trick when the result is pushed.
> Obviously this problem could be hacked around, but it seems to me to
> be a good argument in favour of full line-ending conversion.

Will submitted a patch that checks for DOS line endings and if it finds
them, makes the conflict marker use DOS line endings as well.  I think this
is quite a reasonable solution, although less than a full
line-endings-conversion solution.
David Roundy

More information about the darcs-users mailing list