diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnChangeProvider.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnChangeProvider.java index ebdf274bb4d7..3d837368ed66 100644 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnChangeProvider.java +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnChangeProvider.java @@ -113,7 +113,7 @@ public class SvnChangeProvider implements ChangeProvider { throw new VcsException(e.getCause()); } catch (SVNException e) { if (e.getCause() != null) { - throw new VcsException(e.getMessage() + e.getCause().getMessage(), e); + throw new VcsException(e.getMessage() + " " + e.getCause().getMessage(), e); } throw new VcsException(e); } diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/commandLine/SvnCommandLineStatusClient.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/commandLine/SvnCommandLineStatusClient.java index 38147c52769d..cdc67f6e30ab 100644 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn/commandLine/SvnCommandLineStatusClient.java +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/commandLine/SvnCommandLineStatusClient.java @@ -26,8 +26,6 @@ import org.jetbrains.idea.svn.Util; import org.jetbrains.idea.svn.portable.PortableStatus; import org.jetbrains.idea.svn.portable.SvnExceptionWrapper; import org.jetbrains.idea.svn.portable.SvnStatusClientI; -import org.tmatesoft.sqljet.core.SqlJetErrorCode; -import org.tmatesoft.sqljet.core.SqlJetException; import org.tmatesoft.svn.core.*; import org.tmatesoft.svn.core.internal.util.SVNPathUtil; import org.tmatesoft.svn.core.wc.*; @@ -197,10 +195,10 @@ public class SvnCommandLineStatusClient implements SvnStatusClientI { @Override public void switchPath() { final PortableStatus pending = svnHandl[0].getPending(); - if (pending.isLocked()) { + /*if (pending.isLocked()) { throw new SvnExceptionWrapper(new SVNException(SVNErrorMessage.create(SVNErrorCode.SQLITE_ERROR), - new SqlJetException(SqlJetErrorCode.BUSY))); - } + new SqlJetException(SqlJetErrorCode.BUSY, "Working copy is locked for: " + base))); + }*/ pending.setChangelistName(changelistName[0]); try { //if (infoBase != null) {