Skip to content

Commit 9d33f12

Browse files
committed
Fixed svn repo url comparison logic
1 parent 44e5d2a commit 9d33f12

File tree

1 file changed

+5
-4
lines changed

1 file changed

+5
-4
lines changed

src/main/groovy/com/alexvasilkov/vcs/util/SvnHelper.groovy

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ class SvnHelper {
2020
SVNClientManager client = getClient(repo)
2121

2222
if (exists) {
23-
SVNURL localUrl = getRepoUrl(client, repo)
24-
SVNURL targetUrl = getTargetUrl(repo)
23+
String localUrl = getRepoUrl(client, repo)
24+
String targetUrl = getTargetUrl(repo).toString()
2525

2626
if (!localUrl.equals(targetUrl)) {
2727
throw new GradleException("Svn cannot update from ${localUrl} to ${targetUrl}.\n" +
@@ -91,8 +91,9 @@ class SvnHelper {
9191
return client.statusClient.doStatus(repo.repoDir, false).revision
9292
}
9393

94-
private static SVNURL getRepoUrl(SVNClientManager client, SvnDependency repo) {
95-
return client.statusClient.doStatus(repo.repoDir, false).repositoryRootURL
94+
private static String getRepoUrl(SVNClientManager client, SvnDependency repo) {
95+
SVNStatus status = client.statusClient.doStatus(repo.repoDir, false);
96+
return status.repositoryRootURL.toString() + '/' + status.repositoryRelativePath.toString()
9697
}
9798

9899
private static boolean hasLocalChanges(SVNClientManager client, SvnDependency repo) {

0 commit comments

Comments
 (0)