Index: src/main/org/tigris/subversion/svnclientadapter/commandline/CmdLineClientAdapter.java =================================================================== --- src/main/org/tigris/subversion/svnclientadapter/commandline/CmdLineClientAdapter.java (revision 2785) +++ src/main/org/tigris/subversion/svnclientadapter/commandline/CmdLineClientAdapter.java (working copy) @@ -467,12 +467,12 @@ } /* (non-Javadoc) - * @see org.tigris.subversion.subclipse.client.ISVNClientAdapter#addDirectory(java.io.File, boolean) + * @see org.tigris.subversion.subclipse.client.ISVNClientAdapter#addDirectory(java.io.File, boolean, boolean) */ - public void addDirectory(File file, boolean recurse) throws SVNClientException { + public void addDirectory(File file, boolean recurse, boolean force) throws SVNClientException { try { notificationHandler.setBaseDir(SVNBaseDir.getBaseDir(file)); - _cmd.add(toString(file), recurse); + _cmd.add(toString(file), recurse, force); } catch (CmdLineException e) { //if something is already in svn and we //try to add it, we get a warning. @@ -489,7 +489,7 @@ public void addFile(File file) throws SVNClientException { try { notificationHandler.setBaseDir(SVNBaseDir.getBaseDir(file)); - _cmd.add(toString(file), false); + _cmd.add(toString(file), false, false); } catch (CmdLineException e) { //if something is already in svn and we //try to add it, we get a warning. Index: src/main/org/tigris/subversion/svnclientadapter/commandline/SvnCommandLine.java =================================================================== --- src/main/org/tigris/subversion/svnclientadapter/commandline/SvnCommandLine.java (revision 2785) +++ src/main/org/tigris/subversion/svnclientadapter/commandline/SvnCommandLine.java (working copy) @@ -93,13 +93,18 @@ * @param recursive true if this is a directory * and its children should be traversed * recursively. + * @param force true if this is a directory that + * should be scanned even if it's already added + * to the repository */ - String add(String path, boolean recursive) throws CmdLineException { + String add(String path, boolean recursive, boolean force) throws CmdLineException { setCommand(ISVNNotifyListener.Command.ADD, true); CmdArguments args = new CmdArguments(); args.add("add"); if (!recursive) args.add("-N"); + if (force) + args.add("--force"); args.add(path); return execString(args,false); } Index: src/main/org/tigris/subversion/svnclientadapter/ISVNClientAdapter.java =================================================================== --- src/main/org/tigris/subversion/svnclientadapter/ISVNClientAdapter.java (revision 2785) +++ src/main/org/tigris/subversion/svnclientadapter/ISVNClientAdapter.java (working copy) @@ -72,9 +72,10 @@ * Adds a directory to the repository. * @param dir * @param recurse + * @param force * @throws SVNClientException */ - public abstract void addDirectory(File dir, boolean recurse) + public abstract void addDirectory(File dir, boolean recurse, boolean force) throws SVNClientException; /** Index: src/main/org/tigris/subversion/svnclientadapter/javahl/AbstractJhlClientAdapter.java =================================================================== --- src/main/org/tigris/subversion/svnclientadapter/javahl/AbstractJhlClientAdapter.java (revision 2785) +++ src/main/org/tigris/subversion/svnclientadapter/javahl/AbstractJhlClientAdapter.java (working copy) @@ -177,18 +177,19 @@ } /* (non-Javadoc) - * @see org.tigris.subversion.svnclientadapter.ISVNClientAdapter#addDirectory(java.io.File, boolean) + * @see org.tigris.subversion.svnclientadapter.ISVNClientAdapter#addDirectory(java.io.File, boolean, boolean) */ - public void addDirectory(File dir, boolean recurse) + public void addDirectory(File dir, boolean recurse, boolean force) throws SVNClientException { try { notificationHandler.setCommand(ISVNNotifyListener.Command.ADD); notificationHandler.logCommandLine( "add"+ - (recurse?"":"-N")+ + (recurse?"":" -N")+ + (force?" --force":"")+ " "+dir.toString()); notificationHandler.setBaseDir(SVNBaseDir.getBaseDir(dir)); - svnClient.add(fileToSVNPath(dir, false), recurse); + svnClient.add(fileToSVNPath(dir, false), recurse, force); } catch (ClientException e) { notificationHandler.logException(e); throw new SVNClientException(e); Index: src/main/org/tigris/subversion/svnclientadapter/javahl/JhlClientAdapter.java =================================================================== --- src/main/org/tigris/subversion/svnclientadapter/javahl/JhlClientAdapter.java (revision 2785) +++ src/main/org/tigris/subversion/svnclientadapter/javahl/JhlClientAdapter.java (working copy) @@ -21,7 +21,7 @@ import org.tigris.subversion.svnclientadapter.SVNClientException; /** - * A JavaHL base implementation of {@link ISVNClientAdapter}. + * A JavaHL base implementation of {@link AbstractJhlClientAdapter}. * * @author C�dric Chabanois (cchabanois at no-log.org) * @author Panagiotis Korros (pkorros at bigfoot.com) Index: src/testcases/org/tigris/subversion/svnclientadapter/basictests/StatusTest.java =================================================================== --- src/testcases/org/tigris/subversion/svnclientadapter/basictests/StatusTest.java (revision 2785) +++ src/testcases/org/tigris/subversion/svnclientadapter/basictests/StatusTest.java (working copy) @@ -94,7 +94,7 @@ dir.mkdir(); // add dir - client.addDirectory(dir, true); + client.addDirectory(dir, true, false); List ignoredPatterns = new ArrayList(); ignoredPatterns.add("ignored"); client.setIgnoredPatterns(dir, ignoredPatterns); Index: src/testcases/org/tigris/subversion/svnclientadapter/basictests/AddTest.java =================================================================== --- src/testcases/org/tigris/subversion/svnclientadapter/basictests/AddTest.java (revision 2785) +++ src/testcases/org/tigris/subversion/svnclientadapter/basictests/AddTest.java (working copy) @@ -45,7 +45,7 @@ new FileOutputStream(fileO).close(); // add dir - client.addDirectory(dir, true); + client.addDirectory(dir, true, false); thisTest.getExpectedWC().addItem("dir", null); thisTest.getExpectedWC().setItemTextStatus("dir",SVNStatusKind.ADDED); thisTest.getExpectedWC().addItem("dir/foo.c", "");