diff --git a/WHATSNEW b/WHATSNEW
index 91e8481e6..0820b41a2 100644
--- a/WHATSNEW
+++ b/WHATSNEW
@@ -86,6 +86,9 @@ Other changes:
* Junit task -- display suite first.
Bugzilla report 31962.
+* has a new "overwrite" attribute that, when true, disables
+ checking of target files.
+
Changes from Ant 1.6.2 to current Ant 1.6 CVS version
=====================================================
diff --git a/docs/manual/CoreTasks/apply.html b/docs/manual/CoreTasks/apply.html
index b5c80d22d..54d0fe982 100644
--- a/docs/manual/CoreTasks/apply.html
+++ b/docs/manual/CoreTasks/apply.html
@@ -255,6 +255,12 @@ to send input to it is via the input and inputstring attributes.
via filelists. Since Ant 1.6.2.
No, default is true |
+
+ overwrite |
+ Whether to bypass timestamp comparisons
+ for target files. Since Ant 1.7. |
+ No, default is false |
+
Parameters specified as nested elements
fileset
diff --git a/src/etc/testcases/taskdefs/exec/apply.xml b/src/etc/testcases/taskdefs/exec/apply.xml
index 0567ef879..13eb5d210 100755
--- a/src/etc/testcases/taskdefs/exec/apply.xml
+++ b/src/etc/testcases/taskdefs/exec/apply.xml
@@ -313,10 +313,7 @@
-
-
-
-
+
@@ -341,6 +338,12 @@
+
+
+
+
+
+
@@ -375,6 +378,34 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/testcases/org/apache/tools/ant/taskdefs/ExecuteOnTest.java b/src/testcases/org/apache/tools/ant/taskdefs/ExecuteOnTest.java
index 8fda02663..d24c7c3a5 100755
--- a/src/testcases/org/apache/tools/ant/taskdefs/ExecuteOnTest.java
+++ b/src/testcases/org/apache/tools/ant/taskdefs/ExecuteOnTest.java
@@ -554,6 +554,10 @@ public class ExecuteOnTest extends BuildFileTest {
executeTarget("ignoremissing");
}
+ public void testOverwrite() {
+ executeTarget("overwrite");
+ }
+
//borrowed from TokenFilterTest
private String getFileString(String filename) throws IOException {
String result = null;