Return-Path: X-Original-To: apmail-accumulo-dev-archive@www.apache.org Delivered-To: apmail-accumulo-dev-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 8FB19EC62 for ; Thu, 7 Mar 2013 16:02:07 +0000 (UTC) Received: (qmail 75496 invoked by uid 500); 7 Mar 2013 16:02:07 -0000 Delivered-To: apmail-accumulo-dev-archive@accumulo.apache.org Received: (qmail 75461 invoked by uid 500); 7 Mar 2013 16:02:07 -0000 Mailing-List: contact dev-help@accumulo.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@accumulo.apache.org Delivered-To: mailing list dev@accumulo.apache.org Received: (qmail 75437 invoked by uid 99); 7 Mar 2013 16:02:06 -0000 Received: from minotaur.apache.org (HELO minotaur.apache.org) (140.211.11.9) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 07 Mar 2013 16:02:06 +0000 Received: from localhost (HELO mail-la0-f44.google.com) (127.0.0.1) (smtp-auth username vines, mechanism plain) by minotaur.apache.org (qpsmtpd/0.29) with ESMTP; Thu, 07 Mar 2013 16:02:06 +0000 Received: by mail-la0-f44.google.com with SMTP id eb20so665390lab.17 for ; Thu, 07 Mar 2013 08:02:04 -0800 (PST) X-Received: by 10.152.104.80 with SMTP id gc16mr29086506lab.49.1362672124704; Thu, 07 Mar 2013 08:02:04 -0800 (PST) MIME-Version: 1.0 Reply-To: vines@apache.org Received: by 10.114.28.99 with HTTP; Thu, 7 Mar 2013 08:01:24 -0800 (PST) In-Reply-To: References: From: John Vines Date: Thu, 7 Mar 2013 11:01:24 -0500 Message-ID: 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? To: Keith Turner Cc: Accumulo Dev List Content-Type: multipart/alternative; boundary=f46d040714d5f0421104d757d3f3 --f46d040714d5f0421104d757d3f3 Content-Type: text/plain; charset=ISO-8859-1 Since it was introduced yesterday morning, every merge I've done had at least 1 conflict file, usually multiple. And one to many merges per file (which is how I missed that one yesterday). On Thu, Mar 7, 2013 at 10:57 AM, Keith Turner wrote: > On Thu, Mar 7, 2013 at 10:49 AM, John Vines 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 wrote: > > > >> On Wed, Mar 6, 2013 at 10:23 AM, David Medinets > >> 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? > >> > --f46d040714d5f0421104d757d3f3--