[python-committers] Cannot push after 2.6svn merge

[R. David Murray]

On Fri, 20 May 2011 21:09:02 -0400, Barry Warsaw <barry at python.org> wrote:
> 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 w=

Did you push the .hgeol change first?  That seemed to be
necessary when I ran into something like this.  (But I'm
no hg expert, so I could be all wet on this.)

--David