diff options
Diffstat (limited to 'plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnMergeInfoTest.java')
-rw-r--r-- | plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnMergeInfoTest.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnMergeInfoTest.java b/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnMergeInfoTest.java index 1ed14dce6704..b6d83ad9ed2d 100644 --- a/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnMergeInfoTest.java +++ b/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnMergeInfoTest.java @@ -24,20 +24,20 @@ import com.intellij.openapi.vfs.VirtualFile; import com.intellij.util.ArrayUtil; import com.intellij.util.containers.ContainerUtil; import org.jetbrains.annotations.NotNull; +import org.jetbrains.idea.svn.api.Depth; import org.jetbrains.idea.svn.dialogs.MergeContext; import org.jetbrains.idea.svn.dialogs.WCInfo; import org.jetbrains.idea.svn.history.SvnChangeList; import org.jetbrains.idea.svn.history.SvnRepositoryLocation; +import org.jetbrains.idea.svn.info.Info; import org.jetbrains.idea.svn.mergeinfo.BranchInfo; import org.jetbrains.idea.svn.mergeinfo.OneShotMergeInfoHelper; import org.jetbrains.idea.svn.mergeinfo.SvnMergeInfoCache; import org.junit.Assert; import org.junit.Test; -import org.tmatesoft.svn.core.SVNDepth; import org.tmatesoft.svn.core.SVNException; import org.tmatesoft.svn.core.SVNURL; import org.tmatesoft.svn.core.internal.util.SVNPathUtil; -import org.tmatesoft.svn.core.wc.SVNInfo; import org.tmatesoft.svn.core.wc.SVNPropertyData; import org.tmatesoft.svn.core.wc.SVNRevision; import org.tmatesoft.svn.core.wc.SVNWCClient; @@ -86,7 +86,7 @@ public class SvnMergeInfoTest extends Svn17TestCase { VirtualFile vcsRoot = LocalFileSystem.getInstance().findFileByIoFile(myBranchVcsRoot); Node node = new Node(vcsRoot, SVNURL.parseURIEncoded(myBranchUrl), SVNURL.parseURIEncoded(myRepoUrl)); RootUrlInfo root = new RootUrlInfo(node, WorkingCopyFormat.ONE_DOT_SIX, vcsRoot, null); - myWCInfo = new WCInfo(root, true, SVNDepth.INFINITY); + myWCInfo = new WCInfo(root, true, Depth.INFINITY); myMergeContext = new MergeContext(SvnVcs.getInstance(myProject), myTrunkUrl, myWCInfo, SVNPathUtil.tail(myTrunkUrl), vcsRoot); myOneShotMergeInfoHelper = new OneShotMergeInfoHelper(myMergeContext); @@ -255,7 +255,7 @@ public class SvnMergeInfoTest extends Svn17TestCase { assertMergeInfo(myBranchVcsRoot, "/trunk:3"); - final SVNInfo f1info = myVcs.getInfo(new File(myBranchVcsRoot, "folder/f1.txt")); + final Info f1info = myVcs.getInfo(new File(myBranchVcsRoot, "folder/f1.txt")); assert f1info.getRevision().getNumber() == 2; final List<SvnChangeList> changeListList = getTrunkChangeLists(); |