On May 21, 2011, at 08:11 AM, Martin v. Löwis wrote: >> 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.
Yeah, after my latest hg debacle, this is the only sane way to go. Just in case it isn't obvious, the eol hook prevents pushing any changeset where the files have CRLF. It doesn't have to be on tip. This means if you commit a change w/CRLF and then in a later changeset revert it, you will still not be able to push. Yeah, I found out the hard way. ;) Here's what the devguide has to say about this: "Under Windows, you should also enable the eol extension, which will fix any Windows-specific line endings your text editor might insert when you create or modify versioned files. The public repository has a hook which will reject all changesets having the wrong line endings, so enabling this extension on your local computer is in your best interest." Note: this doesn't necessary pertain just to Windows developers. Also, the description of this hook should include more details, such as the above restriction on *any* changeset, and perhaps instructions on how to install the hook locally so you can't paint yourself into a corner like I did. Many thanks to Ezio, Georg, and RDM on #python-dev for helping me unfubar myself. It required multiple 'hg export|hg import' with some manual trimming of diffs to replay the relevant changes into a fresh repo. Fun time had by all! -Barry
signature.asc
Description: PGP signature
_______________________________________________ python-committers mailing list python-committers@python.org http://mail.python.org/mailman/listinfo/python-committers
