Mailing-List: contact dev-help@accumulo.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@accumulo.apache.org
Received-SPF: neutral (nike.apache.org: local policy)
MIME-Version: 1.0
In-Reply-To: 
 <CADczPYTS9wVHxsbuUvo-ktjTRwy95TxYZdpHq__73LPG-QTHnA@mail.gmail.com>
References: 
 <CAOiJXP6Rwe5DJMW974kb5iRGXP3ZV3ie+-wtc9V4O0gu-ui+kg@mail.gmail.com>
	<CAGUtCHpT26Gbg5mb7AjAbL2XCLZiM9_oRfsfuEPZkowNpLWk9Q@mail.gmail.com>
	<CADczPYTS9wVHxsbuUvo-ktjTRwy95TxYZdpHq__73LPG-QTHnA@mail.gmail.com>
Date: Thu, 7 Mar 2013 10:57:23 -0500
Message-ID: 
 <CAGUtCHpT69DkUZ2v2ozCM-yP-ZQWFD2UVa5hT6YfsmVMcsFKRg@mail.gmail.com>
Subject: Re: One of Checkstyle's rules is 'no spaces at end of line', anyone
 upset if I update the code (1.6) to follow it?
From: Keith Turner <keith@deenlo.com>
To: dev@accumulo.apache.org, vines@apache.org
Content-Type: text/plain; charset=ISO-8859-1

On Thu, Mar 7, 2013 at 10:49 AM, John Vines <vines@apache.org> wrote:
> I've been getting unnecessary merge conflicts because of this change. At
> the very least, I would like to see it reverted until we release 1.5

Or maybe make the change after 1.5.1.  Based on past experience, there
will likely be a good bit of merge activity from 1.5 to 1.6 until at
least the first 1.5 bug fix release.

Curious, how much extra time do this add to merging for you?  I do not
have a good feeling for how well this will be handled automatically.
Did it cause conflicts for most of the edits you made in 1.5?

>
>
> On Thu, Mar 7, 2013 at 10:44 AM, Keith Turner <keith@deenlo.com> wrote:
>
>> On Wed, Mar 6, 2013 at 10:23 AM, David Medinets
>> <david.medinets@gmail.com> wrote:
>> > I have a free day due to snowfall and while this is a fairly silly
>> > rule, writing a short script to rule all the java files through sed
>> > should be fairly painless. As part of this change, I will commit a
>> > one-rule checkstyle.xml file which just runs this 'no spaces at end of
>> > line' rule. Over time, more rules can be added to that align with the
>> > Accumulo community's style guidelines.
>> >
>> > Any objection?
>>
>> Whats the benefit of doing this?  How will it impact merges from 1.5
>> to 1.6?  Should this be done for thrift generated code?
>>