Okay all you Mercurial experts, I need some help! 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.
I asked around on #python-dev and it was suggested that I add some entries into .hgeol, which I've done: Doc/make.bat = CRLF Tools/buildbot/*.bat = CRLF Tools/msi/merge.py = CRLF PC/VS7.1/*.bat = CRLF PC/VS8.0/*.bat = CRLF Yet the push still fails with the errors below. I don't know how to deal with the pretxnchangegroup.eol hook. Any and all assistance will be greatly appreciated. Cheers, -Barry % hg push pushing to ssh://h...@hg.python.org/cpython searching for changes remote: adding changesets remote: adding manifests remote: adding file changes remote: added 5 changesets with 70 changes to 38 files remote: error: pretxnchangegroup.eol hook failed: Doc/make.bat in 03e488b5c009 should not have CRLF line endings remote: PC/VS7.1/build_ssl.bat in 03e488b5c009 should not have CRLF line endings remote: PC/VS8.0/build.bat in 03e488b5c009 should not have CRLF line endings remote: PC/VS8.0/build_env.bat in 03e488b5c009 should not have CRLF line endings remote: PC/VS8.0/build_pgo.bat in 03e488b5c009 should not have CRLF line endings remote: PC/VS8.0/build_ssl.bat in 03e488b5c009 should not have CRLF line endings remote: PC/VS8.0/env.bat in 03e488b5c009 should not have CRLF line endings remote: PC/VS8.0/idle.bat in 03e488b5c009 should not have CRLF line endings remote: PC/VS8.0/rt.bat in 03e488b5c009 should not have CRLF line endings remote: Tools/buildbot/build-amd64.bat in 03e488b5c009 should not have CRLF line endings remote: Tools/buildbot/build.bat in 03e488b5c009 should not have CRLF line endings remote: Tools/buildbot/buildmsi.bat in 03e488b5c009 should not have CRLF line endings remote: Tools/buildbot/clean-amd64.bat in 03e488b5c009 should not have CRLF line endings remote: Tools/buildbot/clean.bat in 03e488b5c009 should not have CRLF line endings remote: Tools/buildbot/external-amd64.bat in 03e488b5c009 should not have CRLF line endings remote: Tools/buildbot/external-common.bat in 03e488b5c009 should not have CRLF line endings remote: Tools/buildbot/external.bat in 03e488b5c009 should not have CRLF line endings remote: Tools/buildbot/test-amd64.bat in 03e488b5c009 should not have CRLF line endings remote: Tools/buildbot/test.bat in 03e488b5c009 should not have CRLF line endings remote: Tools/msi/merge.py in 03e488b5c009 should not have CRLF line endings remote: transaction abort! remote: rollback completed remote: abort: Doc/make.bat in 03e488b5c009 should not have CRLF line endings remote: PC/VS7.1/build_ssl.bat in 03e488b5c009 should not have CRLF line endings remote: PC/VS8.0/build.bat in 03e488b5c009 should not have CRLF line endings remote: PC/VS8.0/build_env.bat in 03e488b5c009 should not have CRLF line endings remote: PC/VS8.0/build_pgo.bat in 03e488b5c009 should not have CRLF line endings remote: PC/VS8.0/build_ssl.bat in 03e488b5c009 should not have CRLF line endings remote: PC/VS8.0/env.bat in 03e488b5c009 should not have CRLF line endings remote: PC/VS8.0/idle.bat in 03e488b5c009 should not have CRLF line endings remote: PC/VS8.0/rt.bat in 03e488b5c009 should not have CRLF line endings remote: Tools/buildbot/build-amd64.bat in 03e488b5c009 should not have CRLF line endings remote: Tools/buildbot/build.bat in 03e488b5c009 should not have CRLF line endings remote: Tools/buildbot/buildmsi.bat in 03e488b5c009 should not have CRLF line endings remote: Tools/buildbot/clean-amd64.bat in 03e488b5c009 should not have CRLF line endings remote: Tools/buildbot/clean.bat in 03e488b5c009 should not have CRLF line endings remote: Tools/buildbot/external-amd64.bat in 03e488b5c009 should not have CRLF line endings remote: Tools/buildbot/external-common.bat in 03e488b5c009 should not have CRLF line endings remote: Tools/buildbot/external.bat in 03e488b5c009 should not have CRLF line endings remote: Tools/buildbot/test-amd64.bat in 03e488b5c009 should not have CRLF line endings remote: Tools/buildbot/test.bat in 03e488b5c009 should not have CRLF line endings remote: Tools/msi/merge.py in 03e488b5c009 should not have CRLF line endings
signature.asc
Description: PGP signature
_______________________________________________ python-committers mailing list python-committers@python.org http://mail.python.org/mailman/listinfo/python-committers
