
May 21, 2011
8:11 a.m.
One of the differences between the Mercurial and Subversion 2.6 branches were the line endings for various Windows files. This change is not appropriate for 2.6, which is in security-fix only mode. I reverted these changes in the Mercurial 2.6 branch, but now I can't push it.
For the 2.5 branch, I just accepted that hg and svn will differ in the EOL representation of some files. So when comparing trees, use diff -w or -b.
Regards, Martin