Return-Path: X-Original-To: apmail-lucene-dev-archive@www.apache.org Delivered-To: apmail-lucene-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 5967BE4F7 for ; Mon, 26 Nov 2012 19:38:15 +0000 (UTC) Received: (qmail 21097 invoked by uid 500); 26 Nov 2012 19:38:14 -0000 Delivered-To: apmail-lucene-dev-archive@lucene.apache.org Received: (qmail 21038 invoked by uid 500); 26 Nov 2012 19:38:14 -0000 Mailing-List: contact dev-help@lucene.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@lucene.apache.org Delivered-To: mailing list dev@lucene.apache.org Received: (qmail 21031 invoked by uid 99); 26 Nov 2012 19:38:14 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 26 Nov 2012 19:38:14 +0000 X-ASF-Spam-Status: No, hits=0.6 required=5.0 tests=RCVD_IN_DNSWL_LOW,SPF_PASS,URI_HEX X-Spam-Check-By: apache.org Received-SPF: pass (nike.apache.org: domain of sarowe@gmail.com designates 209.85.220.176 as permitted sender) Received: from [209.85.220.176] (HELO mail-vc0-f176.google.com) (209.85.220.176) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 26 Nov 2012 19:38:07 +0000 Received: by mail-vc0-f176.google.com with SMTP id fl13so14156197vcb.35 for ; Mon, 26 Nov 2012 11:37:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=content-type:mime-version:subject:from:in-reply-to:date :content-transfer-encoding:message-id:references:to:x-mailer; bh=Ni9kzstCkzXanKkIsRcmn5fWJkLa0niWWylBEwFMdco=; b=oI77+8iJoHaz2l+5okR0ZEQQqkfhQ1DAg/o2JnERIzvOq1aeKvsA9wGh1p0mkXB/tO r+fuW1rSOjwX3svVLSVHqH1U9GRanJVDZMHcx24se0pAK4ZYRKacoggGrDdnoDaGEpm6 6EkTEDefQBRSRVyidsou5YS3xHbh0lMr1oEeVH5ILp+AelU9IZH/A4l8MKpDF4EexxqI MXgxZbGSqQkDAdFqB/6dShRaR/ysa2wducvJISeCPQLvLk//MXIGMCmOHiO/VhAvyzLW emv1EZrVTG9r25FGYqcrJbVz+VZiwV/wTdcf9DNhQMJAoprHDzvrFWYl8AdBxJUfJe1F /Ihw== Received: by 10.220.229.133 with SMTP id ji5mr20566165vcb.51.1353958666197; Mon, 26 Nov 2012 11:37:46 -0800 (PST) Received: from [192.168.1.201] (cpe-67-249-104-72.twcny.res.rr.com. [67.249.104.72]) by mx.google.com with ESMTPS id a6sm8742947vdw.16.2012.11.26.11.37.44 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 26 Nov 2012 11:37:45 -0800 (PST) Content-Type: text/plain; charset=us-ascii Mime-Version: 1.0 (Mac OS X Mail 6.2 \(1499\)) Subject: Re: ant precommit; annoyed with "checkout is dirty" From: Steve Rowe In-Reply-To: Date: Mon, 26 Nov 2012 14:37:43 -0500 Content-Transfer-Encoding: quoted-printable Message-Id: References: <1353941184623-4022362.post@n3.nabble.com> To: dev@lucene.apache.org X-Mailer: Apple Mail (2.1499) X-Virus-Checked: Checked by ClamAV on apache.org I guess there are two classes of things here: new non-ignored = non-svn-controlled files; and modifications to svn-controlled files. My point about svn:ignore was that we could use it to handle the = non-ignored non-svn-controlled files case. I guess you're talking about the svn-controlled modified files case? = And the fact that svn:ignore=3D* doesn't cover this case? If so, okay, = that makes sense. If not, can you increase your word count a little and = help me understand? =20 Steve On Nov 26, 2012, at 2:25 PM, David Smiley (@MITRE.org) = wrote: > AFAIK if you set svn:ignore * then it won't ignore files and = directories that are in source control. >=20 > ~ David >=20 > On Nov 26, 2012, at 1:41 PM, sarowe [via Lucene] wrote: >=20 >> I've always put patches up one level from checked out dirs: svn diff = > ../PROJECT-NNNN.patch; patch -p0 < ../PROJECT-NNNN.patch.=20 >>=20 >> For stuff that should be ignored by everybody (or that wouldn't cause = trouble for others), we could add them to the svn:ignore list for the = directory they're in?=20 >>=20 >> Alternatively, I'd support a set of individually-settable wildcard = exceptions to the dirty-is-bad rule, maybe via a sysprop?=20 >>=20 >> Steve=20 >>=20 >> On Nov 26, 2012, at 1:30 PM, "Smiley, David W." <[hidden = email]> wrote:=20 >>=20 >> > How about doing the dirty checks on sub-directories only? This way = I can keep the random .patch files & miscellany around in the root.=20 >> >=20 >> > The IDE files are a special circumstance for my setup because I use = symbolic links to the IDE files in dev-tools so that I can easily see = how my IDE setup is different than the one in source control, and more = easily commit desirable changes. I might stop doing this if this were = the only thing in my way from "ant precommit".=20 >> >=20 >> > FWIW my solution has been to modify the build script to not do the = dirty check :-)=20 >> >=20 >> > ~ David =20 >> >=20 >> > On Nov 26, 2012, at 11:09 AM, Michael McCandless wrote:=20 >> >=20 >> >> I think the idea is to catch files you forgot to svn add.=20 >> >>=20 >> >> For IDE files, you should just svn ignore them?=20 >> >>=20 >> >> Mike McCandless=20 >> >>=20 >> >> http://blog.mikemccandless.com >> >>=20 >> >> On Mon, Nov 26, 2012 at 9:46 AM, David Smiley (@MITRE.org)=20 >> >> <[hidden = email]> wrote:=20 >> >>> "ant precommit" will check if the source tree is "dirty" (i.e. = contains files=20 >> >>> not in source control) and stop with a failure if so. I find = that rather=20 >> >>> annoying since I've usually got a variety of .patch files and IDE = config=20 >> >>> changes. What is the rationale behind this check? How do people = usually=20 >> >>> deal with it? Perhaps if I do my real development on another = checkout (git=20 >> >>> based), I could then patch on the svn one for the commit. Pretty = annoying=20 >> >>> though, and the 4x port is yet another step. There sure is a lot = of burden=20 >> >>> to getting commits in. I no longer care to improve little = javadoc and typo=20 >> >>> stuff.=20 >> >>>=20 >> >>> ~ David=20 >> >>>=20 >> >>>=20 >> >>>=20 >> >>> -----=20 >> >>> Author: = http://www.packtpub.com/apache-solr-3-enterprise-search-server/book >> >>> --=20 >> >>> View this message in context: = http://lucene.472066.n3.nabble.com/ant-precommit-annoyed-with-checkout-is-= dirty-tp4022362.html >> >>> Sent from the Lucene - Java Developer mailing list archive at = Nabble.com.=20 >> >>>=20 >> >>> = ---------------------------------------------------------------------=20 >> >>> To unsubscribe, e-mail: [hidden = email]=20 >> >>> For additional commands, e-mail: [hidden = email]=20 >> >>>=20 >> >>=20 >> >> = ---------------------------------------------------------------------=20 >> >> To unsubscribe, e-mail: [hidden = email]=20 >> >> For additional commands, e-mail: [hidden = email]=20 >> >>=20 >> >=20 >> >=20 >> > = ---------------------------------------------------------------------=20 >> > To unsubscribe, e-mail: [hidden = email]=20 >> > For additional commands, e-mail: [hidden = email]=20 >> > >>=20 >>=20 >> ---------------------------------------------------------------------=20= >> To unsubscribe, e-mail: [hidden = email]=20 >> For additional commands, e-mail: [hidden = email]=20 >>=20 >>=20 >>=20 >> If you reply to this email, your message will be added to the = discussion below: >> = http://lucene.472066.n3.nabble.com/ant-precommit-annoyed-with-checkout-is-= dirty-tp4022362p4022419.html >> To unsubscribe from ant precommit; annoyed with "checkout is dirty", = click here. >> NAML >=20 > Author: = http://www.packtpub.com/apache-solr-3-enterprise-search-server/book >=20 > View this message in context: Re: ant precommit; annoyed with = "checkout is dirty" > Sent from the Lucene - Java Developer mailing list archive at = Nabble.com. --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscribe@lucene.apache.org For additional commands, e-mail: dev-help@lucene.apache.org