[issue679] patch/merge confuses on windows/unix lineending change
mercurial-bugs at selenic.com
Fri Aug 10 04:15:28 CDT 2007
New submission from AlexRayne <AlexRainPE196 at newmail.ru>:
i`m have an much work to port my patches series on new revision caused by
mixed lineendings produced my editor, mergetool and at source.
the mercurial diff/patch are os-sencitive and therefore my patches some
times are contain whole file replacement caused by lineend changing.
and more - some patches cant be applyed with the same cause.
IMHO mercurial have to process lineends more smart,
SVN have done much work on it, and should be used their expirience:
they check wether file binary or text at 1st add/imort,
in the repository/patch the lineend stored in own style,
and at checkout/patch lineend convert to working os-style.
when commiting changes - the lineends converts to own style back.
if mixed lineend-styles present in a file - failure generates and
inconsistent lineends reported.
title: patch/merge confuses on windows/unix lineending change
topic: diff, merge, patch, windows
Mercurial issue tracker <mercurial-bugs at selenic.com>
More information about the Mercurial-devel