From 5fa61ba9dc60bf5ab6fa6e9d2b5ca68878e26b90 Mon Sep 17 00:00:00 2001
From: Maarten Coene <maartenc@apache.org>
Date: Tue, 3 Mar 2009 20:46:05 +0000
Subject: [PATCH] IMPROVEMENT: ivy:resolve ant task does not support "branch"
 attribute (IVY-1035)

git-svn-id: https://svn.apache.org/repos/asf/ant/ivy/core/trunk@749743 13f79535-47bb-0310-9956-ffa450edef68
---
 doc/use/postresolvetask.html | 1 +
 doc/use/resolve.html         | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/doc/use/postresolvetask.html b/doc/use/postresolvetask.html
index 3707dfe7..9ca7dd1a 100644
--- a/doc/use/postresolvetask.html
+++ b/doc/use/postresolvetask.html
@@ -63,6 +63,7 @@ The attributes listed are then mostly used only if a resolve is triggered automa
     <tr><td>organisation</td><td>the organisation of the module to retrieve. This usually doesn't need to be set since it defaults to the last resolved one, except for inline mode where it is required.</td><td>Yes in inline mode, otherwise no, it then defaults to last resolved module name</td></tr>
     <tr><td>module</td><td>the name of the module to retrieve. This usually doesn't need to be set since it defaults to the last resolved one, except for inline mode where it is required.</td><td>Yes in inline mode, otherwise no, it then defaults to last resolved module name</td></tr>
     <tr><td>revision</td><td>the revision constraint of the module to retrieve. Used only in inline mode. <span class="since">since 1.4</span></td><td>No. Defaults to latest.integration</td></tr>
+    <tr><td>branch</td><td>the name of the branch to resolve in inline mode <span class="since">(since 2.0.1)</span></td><td>Defaults to no branch in inline mode, nothing in standard mode.</td></tr>
     <tr><td>transitive</td><td>true to resolve dependencies transitively, false otherwise <span class="since">since 1.4</span></td><td>No. Defaults to true</td></tr>
     <tr><td>haltonfailure</td><td>true to halt the build on ivy failure, false to continue</td><td>No. Defaults to true</td></tr>
     <tr><td>validate</td><td>true to force ivy files validation against ivy.xsd, false to force no validation</td><td>No. Defaults to default ivy value (as configured in configuration file)</td></tr>
diff --git a/doc/use/resolve.html b/doc/use/resolve.html
index 23db57b1..7ceec75a 100644
--- a/doc/use/resolve.html
+++ b/doc/use/resolve.html
@@ -127,6 +127,8 @@ After the call to this task, a reference to the module descriptor resolved is pu
 
     <tr><td>revision</td><td>the revision constraint to apply to the module to resolve in inline mode <span class="since">since 1.4</span></td><td>No. Defaults to "latest.integration" in inline mode, nothing in standard mode.</td></tr>
 
+    <tr><td>branch</td><td>the name of the branch to resolve in inline mode <span class="since">(since 2.0.1)</span></td><td>Defaults to no branch in inline mode, nothing in standard mode.</td></tr>
+
     <tr><td>type</td><td>comma separated list of accepted artifact types (<span class="since">since 1.2</span>)</td><td>No. defaults to ${ivy.resolve.default.type.filter}</td></tr>
 
     <tr><td>haltonfailure</td><td>true to halt the build on ivy failure, false to continue</td><td>No. Defaults to true</td></tr>