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 CA3E7D105 for ; Thu, 7 Mar 2013 16:56:03 +0000 (UTC) Received: (qmail 70662 invoked by uid 500); 7 Mar 2013 16:56:03 -0000 Delivered-To: apmail-accumulo-dev-archive@accumulo.apache.org Received: (qmail 70479 invoked by uid 500); 7 Mar 2013 16:56:03 -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 70452 invoked by uid 99); 7 Mar 2013 16:56:02 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 07 Mar 2013 16:56:02 +0000 X-ASF-Spam-Status: No, hits=-0.7 required=5.0 tests=RCVD_IN_DNSWL_LOW,SPF_PASS X-Spam-Check-By: apache.org Received-SPF: pass (athena.apache.org: domain of david.medinets@gmail.com designates 209.85.215.170 as permitted sender) Received: from [209.85.215.170] (HELO mail-ea0-f170.google.com) (209.85.215.170) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 07 Mar 2013 16:55:58 +0000 Received: by mail-ea0-f170.google.com with SMTP id e10so228971eaa.15 for ; Thu, 07 Mar 2013 08:55:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:x-received:in-reply-to:references:date:message-id :subject:from:to:content-type; bh=N7BB32YYmV2VKFCPvp+sbgywfBR2HJKvRsxYO15Vm2E=; b=Ecw7HK/DDjsh/mYzTGLWix0kPz5xAMQQRN29xT/5altzayPq6+E9UkxHvhsEMdnpA0 Wuyi96/2ZsN3TIljGKWHTdKJ9JxCuUMjjB8HgeHuc1M7NzYyGH/gZmRfLB9U6LanDM/g HE0Ys06G5BeVgOMEkrevFu/jEvQ9MuJUytBPChqVxRbRI4EMO6YG5SfwdO0ije9QzmDv /qmy4PXhC8geUDOCojhJMxi20jBm89sw+FPx34vG72UswuClCyJ5bhxRHqqk+1HltmFS 2ZqtvqigUQ0F3yr1N6bl0QQx4tkWHipXVcuLD6hhEzBh6k/+PrgGiFQNidaGUaC/Is5P hiRg== MIME-Version: 1.0 X-Received: by 10.194.170.165 with SMTP id an5mr56122563wjc.41.1362675336640; Thu, 07 Mar 2013 08:55:36 -0800 (PST) Received: by 10.194.76.146 with HTTP; Thu, 7 Mar 2013 08:55:36 -0800 (PST) In-Reply-To: References: Date: Thu, 7 Mar 2013 11:55:36 -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? From: David Medinets To: dev@accumulo.apache.org Content-Type: text/plain; charset=ISO-8859-1 X-Virus-Checked: Checked by ClamAV on apache.org I thought it was a safe change because I made it to trunk. Sorry about the disruption. Please revert. This issue is not worth spending any of your time. And we can always run the script later to remove trailing spaces. My concern is why there was a disruption? Could I have done something better? On Thu, Mar 7, 2013 at 11:28 AM, Billie Rinaldi wrote: > Or we could apply the space changes to the 1.5 branch (not the pom change) > ... > > Billie > > > On Thu, Mar 7, 2013 at 11:24 AM, John Vines wrote: > >> The only changes made to trunk since that were my merges, so it should be >> pretty painless to roll it back, revert that change for now, and remerge. >> >> >> On Thu, Mar 7, 2013 at 11:20 AM, Billie Rinaldi wrote: >> >> > I don't mind if we roll it back until we stop doing so much merging. >> > >> > Billie >> > >> > >> > On Thu, Mar 7, 2013 at 11:01 AM, John Vines wrote: >> > >> > > 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? >> > > > >> >> > > > >> > > >> > >>