diff options
| author | Tor Norbye <tnorbye@google.com> | 2014-09-04 20:44:00 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-09-04 20:44:01 +0000 |
| commit | fb5a02906f644d044eb0286bf27d413ba0e05216 (patch) | |
| tree | bca7d49005d81d10c70bc3f547df041c636b4300 /plugins/svn4idea/src/org/jetbrains/idea/svn/SvnUtil.java | |
| parent | 9cde0e3c015174898df8b8f3672185941fad4786 (diff) | |
| parent | d245f58efbfc26b13b9b9d5e52e6a83a0d76216c (diff) | |
| download | idea-fb5a02906f644d044eb0286bf27d413ba0e05216.tar.gz | |
Merge "Merge remote-tracking branch 'aosp/upstream-master' into merge"
Diffstat (limited to 'plugins/svn4idea/src/org/jetbrains/idea/svn/SvnUtil.java')
| -rw-r--r-- | plugins/svn4idea/src/org/jetbrains/idea/svn/SvnUtil.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnUtil.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnUtil.java index aaf46003c1dd..cd0a321d5a58 100644 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnUtil.java +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnUtil.java @@ -790,7 +790,9 @@ public class SvnUtil { e.contains(SVNErrorCode.UNVERSIONED_RESOURCE) || e.contains(SVNErrorCode.WC_NOT_WORKING_COPY) || // thrown when getting info from repository for non-existent item - like HEAD revision for deleted file - e.contains(SVNErrorCode.ILLEGAL_TARGET); + e.contains(SVNErrorCode.ILLEGAL_TARGET) || + // for svn 1.6 + StringUtil.containsIgnoreCase(e.getMessage(), "(not a versioned resource)"); } // TODO: Create custom Target class and implement append there |