Unfortunately, I did not notice Hg failed it's job in converting CR/LF to LF line endings and as result, CR/LF EOLs were pushed.
What's worse is that this issue was discovered too late, and we have two problems:
- Default -> 2.0 merge was veeeery difficult. I'm not doing this twice. Not a chance.
- There are already commits being pushed on top of default's branch with the wrong EOL; sometimes CR/LF & LF are being mixed now.
Alternatives I can see:
- Push an .hgeol file to the repo so that everyone commits using CR/LF line endings from now on. (AFAIK the user still manually need to enable the eol extension)
- Perform another mass commit to go back to LF. Then merge with branches but keep all files "mine". But it may create more fiasco.