diff options
Diffstat (limited to 'plugins/svn4idea/src/org/jetbrains/idea/svn/update/AbstractUpdateIntegrateCrawler.java')
-rw-r--r-- | plugins/svn4idea/src/org/jetbrains/idea/svn/update/AbstractUpdateIntegrateCrawler.java | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/update/AbstractUpdateIntegrateCrawler.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/update/AbstractUpdateIntegrateCrawler.java index 47b15802287b..991c2fe1e7b2 100644 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn/update/AbstractUpdateIntegrateCrawler.java +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/update/AbstractUpdateIntegrateCrawler.java @@ -22,9 +22,7 @@ import com.intellij.openapi.vcs.update.UpdatedFiles; import org.jetbrains.idea.svn.SvnBundle; import org.jetbrains.idea.svn.SvnVcs; import org.jetbrains.idea.svn.SvnWCRootCrawler; -import org.tmatesoft.svn.core.SVNErrorCode; -import org.tmatesoft.svn.core.SVNErrorMessage; -import org.tmatesoft.svn.core.SVNException; +import org.jetbrains.idea.svn.commandLine.SvnBindException; import java.io.File; import java.util.Collection; @@ -58,13 +56,9 @@ public abstract class AbstractUpdateIntegrateCrawler implements SvnWCRootCrawler long rev = doUpdate(root); if (rev < 0 && !isMerge()) { - throw new SVNException(SVNErrorMessage.create(SVNErrorCode.UNKNOWN, SvnBundle.message("exception.text.root.was.not.properly.updated", root))); + throw new SvnBindException(SvnBundle.message("exception.text.root.was.not.properly.updated", root)); } } - catch (SVNException e) { - LOG.info(e); - myExceptions.add(new VcsException(e)); - } catch (VcsException e) { LOG.info(e); myExceptions.add(e); @@ -73,7 +67,7 @@ public abstract class AbstractUpdateIntegrateCrawler implements SvnWCRootCrawler protected abstract void showProgressMessage(ProgressIndicator progress, File root); - protected abstract long doUpdate(File root) throws SVNException, VcsException; + protected abstract long doUpdate(File root) throws VcsException; protected abstract boolean isMerge(); } |