svn commit: r713671 - in /ant/core/trunk: docs/manual/CoreTasks/delete.html src/tests/antunit/taskdefs/delete-and-symlinks-test.xml

[bodewig]

Author: bodewig
Date: Wed Nov 12 23:44:31 2008
New Revision: 713671

URL: http://svn.apache.org/viewvc?rev=713671&view=rev
Log:
document that <delete dir=...> doesn't play well with symlinks.  PR 45742.

Modified:
    ant/core/trunk/docs/manual/CoreTasks/delete.html
    ant/core/trunk/src/tests/antunit/taskdefs/delete-and-symlinks-test.xml

Modified: ant/core/trunk/docs/manual/CoreTasks/delete.html
URL: 
http://svn.apache.org/viewvc/ant/core/trunk/docs/manual/CoreTasks/delete.html?rev=713671&r1=713670&r2=713671&view=diff
==============================================================================
--- ant/core/trunk/docs/manual/CoreTasks/delete.html (original)
+++ ant/core/trunk/docs/manual/CoreTasks/delete.html Wed Nov 12 23:44:31 2008
@@ -45,6 +45,13 @@
 in <strong>Directory-based Tasks</strong>, and see the
 <code>defaultexcludes</code> attribute below.
 
+<p>For historical reasons <code>&lt;delete dir="x"/&gt;</code> is
+  different from <code>&lt;delete&gt;&lt;fileset
+  dir="x"/&gt;&lt;/delete&gt;</code>, it will try to remove everything
+  inside "x" including "x" itself, not taking default excludes into
+  account, blindly following all symbolic links.  If you need more
+  control, use a nested <code>&lt;fileset&gt;</code>.</p>
+
 <h3>Parameters</h3>
 <table border="1" cellpadding="2" cellspacing="0">
   <tr>

Modified: ant/core/trunk/src/tests/antunit/taskdefs/delete-and-symlinks-test.xml
URL: 
http://svn.apache.org/viewvc/ant/core/trunk/src/tests/antunit/taskdefs/delete-and-symlinks-test.xml?rev=713671&r1=713670&r2=713671&view=diff
==============================================================================
--- ant/core/trunk/src/tests/antunit/taskdefs/delete-and-symlinks-test.xml 
(original)
+++ ant/core/trunk/src/tests/antunit/taskdefs/delete-and-symlinks-test.xml Wed 
Nov 12 23:44:31 2008
@@ -31,13 +31,6 @@
     <symlink action="delete" link="${link}"/>
   </target>
 
-  <target name="xtestLinkCycle" if="unix">
-    <mkdir dir="${input}/A/B"/>
-    <property name="link" location="${input}/A/B/C"/>
-    <symlink link="${link}" resource="${input}/A"/>
-    <delete dir="${input}"/>
-  </target>
-
   <target name="testNotFollowedLink" if="unix">
     <mkdir dir="${input}/A/B"/>
     <mkdir dir="${input}/C"/>