On Wed, Dec 29, 2010 at 18:44, Dave Page <dpage@pgadmin.org> wrote:
> On Wed, Dec 29, 2010 at 5:30 PM, Magnus Hagander <magnus@hagander.net> wrote:
>> I just did a testrun with astyle to reindent and restyle the code. I
>> created a rule in Makefile.am per:
>>
>> diff --git a/Makefile.am b/Makefile.am
>> index be6af45..8266f8d 100644
>> --- a/Makefile.am
>> +++ b/Makefile.am
>> @@ -65,3 +65,13 @@ endif
>> # We need to ensure the help cache is world writeable
>> install-data-hook:
>> chmod 0666 $(help_cache)
>> +
>> +# Perform astyle cleanup per rules:
>> +# * -p - insert space around parenthesis
>> +# * -b - bracket style
>> +# * -S - indent switches
>> +# * -s4 - intent with spaces, 4 of them
>
> Didn't we say we were going to move to tabs?
I went by Guillaume's statement, which was that spaces was the last we
said but there was some discussion about tabs that didn't really go
anyway.
I'm all for tabs on the basis that pg uses it. However, the diff is a
lot bigger:
631 files changed, 87029 insertions(+), 81196 deletions(-)
which indicates that we are using spaces a lot more today.
>> It's going to cause merge conflicts like hell. but it's going to do
>> that whenever we run it. So should we just go ahead and run it?
>
> Why not? :-)
Because we haven't decided on tabs vs spaces yet? ;) Anyway, when that's done...
--
Magnus Hagander
Me: http://www.hagander.net/
Work: http://www.redpill-linpro.com/