[MERGE] Less bazaar coding style regressions.

Martin Pool mbp at canonical.com
Tue Dec 9 17:18:07 GMT 2008


On Tue, Dec 9, 2008 at 12:21 AM, Marius Kruger <amanic at gmail.com> wrote:

>> If we're going to address it
>> I'd rather have a proper test along the lines of test_source that
>> doesn't look only at uncommitted changes, and doing that requires
>> stripping out the existing whitespace.
>>
>> I'd merge a change that takes it off.  It's easy enough to catch up
>> with this when merging later, and it'll avoid the issue coming back
>> again.
>
> I'd be happy to write a test that tests all the source for trailing white
> space
> and then make it pass, if there is a chance that it would get merged.
> You do know that it is going to cause a lot of "spurious changes" and lots
> of conflicts.
> Are we willing to take the pain?

It's not going to be that hard: when it conflicts, people can just
strip the whitespace off the .THIS file, and merge them again.  Let's
just do it.  I'm willing to merge that patch.

-- 
Martin <http://launchpad.net/~mbp/>



More information about the bazaar mailing list