Re: [python-committers] Cannot push after 2.6svn merge

2011-05-23 Thread Barry Warsaw
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 M

Re: [python-committers] Cannot push after 2.6svn merge

2011-05-22 Thread Barry Warsaw
On May 20, 2011, at 09:22 PM, R. David Murray wrote: >On Fri, 20 May 2011 21:09:02 -0400, Barry Warsaw 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

Re: [python-committers] Cannot push after 2.6svn merge

2011-05-20 Thread Martin v. Löwis
> 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

Re: [python-committers] Cannot push after 2.6svn merge

2011-05-20 Thread R. David Murray
On Fri, 20 May 2011 21:09:02 -0400, Barry Warsaw 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 >