And once again I escape having to merge anything....
I'm really going to have to learn to do that before
1.6.2... :(
-Matt
--- [EMAIL PROTECTED] wrote:
> peterreilly 2004/04/14 01:21:35
>
> Modified:
> src/main/org/apache/tools/ant/taskdefs Tag:
> ANT_16_BRANCH
> ImportTask.java
> Log:
> sync with HEAD - optional attribute and verbose
> skip log
>
> Revision Changes Path
> No revision
> No revision
> 1.16.2.10 +2 -2
>
ant/src/main/org/apache/tools/ant/taskdefs/ImportTask.java
>
> Index: ImportTask.java
>
>
===================================================================
> RCS file:
>
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/ImportTask.java,v
> retrieving revision 1.16.2.9
> retrieving revision 1.16.2.10
> diff -u -r1.16.2.9 -r1.16.2.10
> --- ImportTask.java 9 Mar 2004 17:01:33 -0000
> 1.16.2.9
> +++ ImportTask.java 14 Apr 2004 08:21:35 -0000
> 1.16.2.10
> @@ -66,7 +66,7 @@
> * default is false
> */
> public void setOptional(boolean optional) {
> - this.optional = true;
> + this.optional = optional;
> }
>
> /**
> @@ -136,7 +136,7 @@
> if (importStack.contains(importedFile)) {
> getProject().log(
> "Skipped already imported file:\n
> "
> - + importedFile + "\n",
> Project.MSG_WARN);
> + + importedFile + "\n",
> Project.MSG_VERBOSE);
> return;
> }
>
>
>
>
>
>
---------------------------------------------------------------------
> To unsubscribe, e-mail:
> [EMAIL PROTECTED]
> For additional commands, e-mail:
> [EMAIL PROTECTED]
>
__________________________________
Do you Yahoo!?
Yahoo! Tax Center - File online by April 15th
http://taxes.yahoo.com/filing.html
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
