Index: lib/svnClientAdapter.jar =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: src/main/org/tigris/subversion/svnant/commands/Add.java =================================================================== --- src/main/org/tigris/subversion/svnant/commands/Add.java (revision 2758) +++ src/main/org/tigris/subversion/svnant/commands/Add.java (working copy) @@ -87,6 +87,9 @@ /** add recursively ? (only for dir attribute) */ private boolean recurse = true; + /** check directories already under version control during add ? (only for dir attribute) */ + private boolean force = false; + public void execute() throws SvnAntException { // deal with the single file @@ -96,7 +99,7 @@ // deal with a directory if (dir != null) { - svnAddDir(dir, recurse); + svnAddDir(dir, recurse, force); } // deal with filesets @@ -163,7 +166,7 @@ * @param recursive * @throws SvnAntException */ - private void svnAddDir(File aDir, boolean recursive) throws SvnAntException { + private void svnAddDir(File aDir, boolean recursive, boolean force) throws SvnAntException { if (aDir.exists()) { if (!aDir.isDirectory()) { logWarning( @@ -174,7 +177,7 @@ } else { try { - svnClient.addDirectory(aDir, recursive); + svnClient.addDirectory(aDir, recursive, force); } catch (Exception e) { throw new SvnAntException( "Can't add directory " @@ -298,6 +301,14 @@ this.recurse = recurse; } + /** + * if set, directory will be checked for new content even if already managed by subversion (see setDir) + * @param recurse + */ + public void setForce(boolean force) { + this.force = force; + } + /** * Adds a set of files to add * @param set