Re: [sage-devel] Re: placeholders in __init__.py

2011-06-29 Thread Jeroen Demeyer
On 2011-06-29 18:31, Maarten Derickx wrote: > Sorry for the untrue statement above about git=1 not being compatible > with the patchbot. The reason the mentioned patch was rejected is > because there was: > > Detected SAGE64 flag > Building Sage on OS X in 64-bit mode > > at the top of the file.

[sage-devel] Re: placeholders in __init__.py

2011-06-29 Thread Maarten Derickx
Sorry for the untrue statement above about git=1 not being compatible with the patchbot. The reason the mentioned patch was rejected is because there was: Detected SAGE64 flag Building Sage on OS X in 64-bit mode at the top of the file. -- To post to this group, send an email to sage-devel@go

[sage-devel] Re: placeholders in __init__.py

2011-06-25 Thread Maarten Derickx
I just found out that having [diff] git=1 Is not compatible with the current patchbot, i.e. see the log of applying a patch I created while having the git=1 setting in my .hgrc at: http://sage.math.washington.edu:21100/log/11540/linux/ubuntu/hardy/sage.math.washington.edu/2011-06-24%2011:3

[sage-devel] Re: placeholders in __init__.py

2011-06-20 Thread Keshav Kini
Indeed, this is very important. Mercurial patches are lossy by default. Putting those lines in your .hgrc will make Mercurial use the lossless git diff format for patches instead. Trac #11121 makes Sage's Mercurial use git diff format by default - it's awaiting review ;) -Keshav Join us i

[sage-devel] Re: placeholders in __init__.py

2011-06-18 Thread Simon King
Hi Mike, hi Keshav On 18 Jun., 00:00, Mike Hansen wrote: > On Fri, Jun 17, 2011 at 2:55 PM, Keshav Kini wrote: > > I asked some guys in #mercurial and they said they'd never heard of > > repository corruption from empty files or mercurial not being able to commit > > empty files. What's the reas