[MERGE] whitespace normalization

[Ben Finney]

Andrew Bennetts <andrew at canonical.com> writes:

> Ben Finney wrote:
> > 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.
> 
> Do you have any evidence that this has happened to people working on
> bzr?

I'm not sure how I would have that evidence, as I don't interact with
the Bazaar code base. My argument was made on the basis that such
spurious conflicts are caused by such whitespace changes between
different users, regardless of whether they're done all in one go or
dispersed over the history of the code base.

> I certainly don't recall encountering this myself, so I think your
> concern is hypothetical. Maybe there's something different about how
> other people work that I'm not aware of?

Perhaps we mean different things by "cause spurious conflicts". Can
you explain what you mean by that, and how it applies to one set of
whitespaces but not another?

-- 
 \     “Cross country skiing is great if you live in a small country.” |
  `\                                                    —Steven Wright |
_o__)                                                                  |
Ben Finney