[MERGE] whitespace normalization

Ben Finney bignose+hates-spam at benfinney.id.au
Fri Jul 25 00:35:44 BST 2008

Aaron Bentley <aaron at aaronbentley.com> writes:

> Aaron Bentley has voted reject.
> Status is now: Vetoed
> Comment:
> Changes like this cause spurious conflicts.

As do differences between files caused by *not* normalising the
whitespace in the code base.

If the code has been allowed to become inconsistent with whitespace,
it seems the only long-term solution is to declare an
automaticaly-checkable policy, convert the code base, and reject any
future commit that doesn't conform.

Would Benjamin's patch be better if a whitespace policy (such as
"conform with PEP 8 whitespace suggestions", or even "ensure
whitespace is as produced by reindent.py") were implemented, before a
one-time fixup to the code base?

 \        “The right to search for truth implies also a duty; one must |
  `\      not conceal any part of what one has recognized to be true.” |
_o__)                                                 —Albert Einstein |
Ben Finney

More information about the bazaar mailing list