lucene-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Steve Rowe <sar...@gmail.com>
Subject Re: ant precommit; annoyed with "checkout is dirty"
Date Mon, 26 Nov 2012 19:37:43 GMT
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=*
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?   

Steve

On Nov 26, 2012, at 2:25 PM, David Smiley (@MITRE.org) <DSMILEY@mitre.org> wrote:

> AFAIK if you set svn:ignore * then it won't ignore files and directories that are in
source control.
> 
> ~ David
> 
> On Nov 26, 2012, at 1:41 PM, sarowe [via Lucene] wrote:
> 
>> I've always put patches up one level from checked out dirs: svn diff > ../PROJECT-NNNN.patch;
patch -p0 < ../PROJECT-NNNN.patch. 
>> 
>> 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? 
>> 
>> Alternatively, I'd support a set of individually-settable wildcard exceptions to
the dirty-is-bad rule, maybe via a sysprop? 
>> 
>> Steve 
>> 
>> On Nov 26, 2012, at 1:30 PM, "Smiley, David W." <<a href="x-msg://149/user/SendEmail.jtp?type=node&amp;node=4022419&amp;i=0"
target="_top" rel="nofollow" link="external">[hidden email]> wrote: 
>> 
>> > How about doing the dirty checks on sub-directories only?  This way I can keep
the random .patch files & miscellany around in the root. 
>> > 
>> > 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". 
>> > 
>> > FWIW my solution has been to modify the build script to not do the dirty check
:-) 
>> > 
>> > ~ David   
>> > 
>> > On Nov 26, 2012, at 11:09 AM, Michael McCandless wrote: 
>> > 
>> >> I think the idea is to catch files you forgot to svn add. 
>> >> 
>> >> For IDE files, you should just svn ignore them? 
>> >> 
>> >> Mike McCandless 
>> >> 
>> >> http://blog.mikemccandless.com
>> >> 
>> >> On Mon, Nov 26, 2012 at 9:46 AM, David Smiley (@MITRE.org) 
>> >> <<a href="x-msg://149/user/SendEmail.jtp?type=node&amp;node=4022419&amp;i=1"
target="_top" rel="nofollow" link="external">[hidden email]> wrote: 
>> >>> "ant precommit" will check if the source tree is "dirty" (i.e. contains
files 
>> >>> not in source control) and stop with a failure if so.  I find that rather

>> >>> annoying since I've usually got a variety of .patch files and IDE config

>> >>> changes.  What is the rationale behind this check?  How do people usually

>> >>> deal with it?  Perhaps if I do my real development on another checkout
(git 
>> >>> based), I could then patch on the svn one for the commit.  Pretty annoying

>> >>> though, and the 4x port is yet another step.  There sure is a lot of
burden 
>> >>> to getting commits in.  I no longer care to improve little javadoc and
typo 
>> >>> stuff. 
>> >>> 
>> >>> ~ David 
>> >>> 
>> >>> 
>> >>> 
>> >>> ----- 
>> >>> Author: http://www.packtpub.com/apache-solr-3-enterprise-search-server/book
>> >>> -- 
>> >>> 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.

>> >>> 
>> >>> ---------------------------------------------------------------------

>> >>> To unsubscribe, e-mail: <a href="x-msg://149/user/SendEmail.jtp?type=node&amp;node=4022419&amp;i=2"
target="_top" rel="nofollow" link="external"> [hidden email] 
>> >>> For additional commands, e-mail: <a href="x-msg://149/user/SendEmail.jtp?type=node&amp;node=4022419&amp;i=3"
target="_top" rel="nofollow" link="external"> [hidden email] 
>> >>> 
>> >> 
>> >> --------------------------------------------------------------------- 
>> >> To unsubscribe, e-mail: <a href="x-msg://149/user/SendEmail.jtp?type=node&amp;node=4022419&amp;i=4"
target="_top" rel="nofollow" link="external"> [hidden email] 
>> >> For additional commands, e-mail: <a href="x-msg://149/user/SendEmail.jtp?type=node&amp;node=4022419&amp;i=5"
target="_top" rel="nofollow" link="external"> [hidden email] 
>> >> 
>> > 
>> > 
>> > --------------------------------------------------------------------- 
>> > To unsubscribe, e-mail: <a href="x-msg://149/user/SendEmail.jtp?type=node&amp;node=4022419&amp;i=6"
target="_top" rel="nofollow" link="external"> [hidden email] 
>> > For additional commands, e-mail: <a href="x-msg://149/user/SendEmail.jtp?type=node&amp;node=4022419&amp;i=7"
target="_top" rel="nofollow" link="external"> [hidden email] 
>> >
>> 
>> 
>> --------------------------------------------------------------------- 
>> To unsubscribe, e-mail: <a href="x-msg://149/user/SendEmail.jtp?type=node&amp;node=4022419&amp;i=8"
target="_top" rel="nofollow" link="external"> [hidden email] 
>> For additional commands, e-mail: <a href="x-msg://149/user/SendEmail.jtp?type=node&amp;node=4022419&amp;i=9"
target="_top" rel="nofollow" link="external"> [hidden email] 
>> 
>> 
>> 
>> 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
> 
>  Author: http://www.packtpub.com/apache-solr-3-enterprise-search-server/book
> 
> 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


Mime
View raw message