Return-Path: Delivered-To: apmail-jakarta-ant-dev-archive@jakarta.apache.org Received: (qmail 71308 invoked by uid 500); 3 May 2001 19:54:48 -0000 Mailing-List: contact ant-dev-help@jakarta.apache.org; run by ezmlm Precedence: bulk Reply-To: ant-dev@jakarta.apache.org list-help: list-unsubscribe: list-post: Delivered-To: mailing list ant-dev@jakarta.apache.org Received: (qmail 71177 invoked from network); 3 May 2001 19:54:42 -0000 Sender: jglick@sunpraha.Czech.Sun.COM Message-ID: <3AF1C5DE.EFD0CB0A@netbeans.com> Date: Thu, 03 May 2001 21:55:58 +0100 From: Jesse Glick Organization: Sun Microsystems / NetBeans X-Mailer: Mozilla 4.76 [en] (X11; U; Linux 2.2.12-20 i686) X-Accept-Language: en MIME-Version: 1.0 To: Ant List Subject: [PATCH] update DesirableFilter Content-Type: multipart/mixed; boundary="------------63BEECA34DC752A87F36ACD2" X-Spam-Rating: h31.sny.collab.net 1.6.2 0/1000/N This is a multi-part message in MIME format. --------------63BEECA34DC752A87F36ACD2 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit The default-exclude patterns in DesirableFilter fell a bit behind those in DirectoryScanner. -Jesse -- Jesse Glick NetBeans, Open APIs tel (+4202) 3300-9161 Sun Micro x49161 Praha CR --------------63BEECA34DC752A87F36ACD2 Content-Type: text/plain; charset=us-ascii; name="desirablefilter.diff" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="desirablefilter.diff" Index: src/main/org/apache/tools/ant/DesirableFilter.java =================================================================== RCS file: /home/cvspublic/jakarta-ant/src/main/org/apache/tools/ant/DesirableFilter.java,v retrieving revision 1.3 diff -u -t -r1.3 DesirableFilter.java --- src/main/org/apache/tools/ant/DesirableFilter.java 2001/01/03 14:18:26 1.3 +++ src/main/org/apache/tools/ant/DesirableFilter.java 2001/05/03 19:50:50 @@ -103,6 +103,16 @@ if (name.equals(".cvsignore")){ return false; } + + // CVS merge autosaves. + if (name.startsWith(".#")) { + return false; + } + + // SCCS/CSSC/TeamWare: + if (name.equals("SCCS")) { + return false; + } // default return true; --------------63BEECA34DC752A87F36ACD2--