From 56573abb5d722bd3e2b207baf6a33f3ae46435d4 Mon Sep 17 00:00:00 2001
From: Diane Holt <holtdl@apache.org>
Date: Thu, 28 Mar 2002 23:11:08 +0000
Subject: [PATCH] Rats! -- forgot to doc it. (See: P4Base.java, rev 1.12) PR:
 Obtained from: Submitted by: Reviewed by:

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@272078 13f79535-47bb-0310-9956-ffa450edef68
---
 WHATSNEW                                |  2 ++
 docs/manual/OptionalTasks/perforce.html | 20 ++++++++++++++++++++
 2 files changed, 22 insertions(+)

diff --git a/WHATSNEW b/WHATSNEW
index 1711ea8b2..f35d9b4d1 100644
--- a/WHATSNEW
+++ b/WHATSNEW
@@ -249,6 +249,8 @@ Other changes:
 
 * <patternset> now supports nested patternsets.
 
+* Perforce tasks now support a "failonerror" attribute (defaults to "true").
+
 Changes from Ant 1.4 to Ant 1.4.1
 ===========================================
 
diff --git a/docs/manual/OptionalTasks/perforce.html b/docs/manual/OptionalTasks/perforce.html
index da132d710..dc145dae7 100644
--- a/docs/manual/OptionalTasks/perforce.html
+++ b/docs/manual/OptionalTasks/perforce.html
@@ -125,6 +125,26 @@ or environment variables. These are
 <p>
 Your local installation of Perforce may require other settings (e.g. P4PASSWD, P4CONFIG). At the moment, these can only be set outside of Ant, as environment variables.
 </p>
+<p>
+Additionally, you may also specify the following attributes:
+</p>
+<p>
+<table border="1" cellpadding="2" cellspacing="0">
+<tr>
+  <td valign="top"><b>Attribute</b></td>
+  <td valign="top"><b>Description</b></td>
+  <td align="center" valign="top"><b>Required</b></td>
+</tr>
+<tr>
+    <td valign="top">failonerror</td>
+    <td valign="top">Specifies whether to stop the build
+     (<code>true</code>|<code>yes</code>|<code>on</code>)
+     or keep going (<code>false</code>|<code>no</code>|<code>off</code>)
+     if an error is returned from the p4 command.</td>
+    <td valign="top">No; defaults to true.</td>
+  </tr>
+</table>
+</p>
 
 <h3>Examples</h3>
 <p>Setting in the environment:-</p>